aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Buland <mike@xagasoft.com>2022-09-29 18:08:20 -0700
committerMike Buland <mike@xagasoft.com>2022-09-29 18:08:20 -0700
commit7ca8e2fd4e2cb712d6bac31e3c00a261a4e28102 (patch)
treee4e90f2dc7c67a6a767e8482e3b55f9f9caab6eb
parent64949cc6df77f910a1788392586759f784e62ae2 (diff)
downloadbuild-7ca8e2fd4e2cb712d6bac31e3c00a261a4e28102.tar.gz
build-7ca8e2fd4e2cb712d6bac31e3c00a261a4e28102.tar.bz2
build-7ca8e2fd4e2cb712d6bac31e3c00a261a4e28102.tar.xz
build-7ca8e2fd4e2cb712d6bac31e3c00a261a4e28102.zip
Oops, assumed bash, using sh now.
It should use the SHELL environment variable, and have a backup list, and use shells as defined by the buildscript.
-rw-r--r--src/context.cpp2
-rw-r--r--src/functionexecute.cpp2
-rw-r--r--src/functiongetmakedeps.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/context.cpp b/src/context.cpp
index b9c215a..6e27256 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -238,7 +238,7 @@ Bu::String Context::expand( const Bu::String &sInS )
238 { 238 {
239 //sio << "Executing command: >>>" << sCmd << "<<<" << sio.nl; 239 //sio << "Executing command: >>>" << sCmd << "<<<" << sio.nl;
240 Process p( Process::StdOut, 240 Process p( Process::StdOut,
241 "/bin/bash", "/bin/bash", "-c", sCmd.getStr(), NULL 241 "/bin/sh", "/bin/sh", "-c", sCmd.getStr(), NULL
242 ); 242 );
243 char buf[4096]; 243 char buf[4096];
244 do 244 do
diff --git a/src/functionexecute.cpp b/src/functionexecute.cpp
index 8d87047..17f49eb 100644
--- a/src/functionexecute.cpp
+++ b/src/functionexecute.cpp
@@ -35,7 +35,7 @@ Variable FunctionExecute::call( Variable &/*input*/, VarList lParams )
35 // TODO This is lame, really lame, we need to exec on our own and process 35 // TODO This is lame, really lame, we need to exec on our own and process
36 // output appropriately. 36 // output appropriately.
37 pContext->getView()->cmdStarted( lParams.first().getString() ); 37 pContext->getView()->cmdStarted( lParams.first().getString() );
38 Process pCmd( Process::Both, "/bin/bash", "/bin/bash", "-c", 38 Process pCmd( Process::Both, "/bin/sh", "/bin/sh", "-c",
39 lParams.first().getString().getStr(), NULL ); 39 lParams.first().getString().getStr(), NULL );
40 String sStdOut, sStdErr; 40 String sStdOut, sStdErr;
41 do 41 do
diff --git a/src/functiongetmakedeps.cpp b/src/functiongetmakedeps.cpp
index a44f653..69003ba 100644
--- a/src/functiongetmakedeps.cpp
+++ b/src/functiongetmakedeps.cpp
@@ -33,7 +33,7 @@ Bu::String FunctionGetMakeDeps::getName() const
33Variable FunctionGetMakeDeps::call( Variable &/*input*/, VarList lParams ) 33Variable FunctionGetMakeDeps::call( Variable &/*input*/, VarList lParams )
34{ 34{
35 pContext->getView()->cmdStarted( lParams.first().getString().getStr() ); 35 pContext->getView()->cmdStarted( lParams.first().getString().getStr() );
36 Process p( Process::StdOut, "/bin/bash", "/bin/bash", "-c", 36 Process p( Process::StdOut, "/bin/sh", "/bin/sh", "-c",
37 lParams.first().getString().getStr(), NULL ); 37 lParams.first().getString().getStr(), NULL );
38 38
39 // Gather all data from the command. 39 // Gather all data from the command.