mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use bash for init/prebuild, not sh

Browse source
This commit is contained in:
Ciaran Gultnieks 2013-06-04 22:38:44 +01:00
parent 6b269ac644
commit 9ff536eae6
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/fdroid.texi
View file

@ -789,6 +789,8 @@ insert literal commas, or as the last character on a line to join that
line with the next. It has no special meaning in other contexts; in line with the next. It has no special meaning in other contexts; in
particular, literal backslashes should not be escaped. particular, literal backslashes should not be escaped.
The command runs using bash.
Note that nothing should be build during this prebuild phase - scanning Note that nothing should be build during this prebuild phase - scanning
of the code and building of the source tarball, for example, take place of the code and building of the source tarball, for example, take place
after this. For custom actions that actually build things, use 'build' after this. For custom actions that actually build things, use 'build'

4
fdroidserver/common.py
View file

@ -1081,7 +1081,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
init = init.replace('$$NDK$$', ndk_path) init = init.replace('$$NDK$$', ndk_path)
init = init.replace('$$MVN$$', mvn3) init = init.replace('$$MVN$$', mvn3)
if verbose: print "Doing init: exec '%s' in '%s'"%(init,root_dir) if verbose: print "Doing init: exec '%s' in '%s'"%(init,root_dir)
if subprocess.call(init, cwd=root_dir, shell=True) != 0: if subprocess.call(['bash', '-c', init], cwd=root_dir) != 0:
raise BuildException("Error running init command") raise BuildException("Error running init command")
# Generate (or update) the ant build file, build.xml... # Generate (or update) the ant build file, build.xml...
@ -1261,7 +1261,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
prebuild = prebuild.replace('$$SDK$$', sdk_path) prebuild = prebuild.replace('$$SDK$$', sdk_path)
prebuild = prebuild.replace('$$NDK$$', ndk_path) prebuild = prebuild.replace('$$NDK$$', ndk_path)
prebuild = prebuild.replace('$$MVN3$$', mvn3) prebuild = prebuild.replace('$$MVN3$$', mvn3)
p = subprocess.Popen(prebuild, cwd=root_dir, shell=True, p = subprocess.Popen(['bash', '-c', prebuild], cwd=root_dir,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = p.communicate() out, err = p.communicate()
if p.returncode != 0: if p.returncode != 0: