i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bashisms

Browse Source 
Besides, at least one test was probably incorrect,
trying to match /* with a single = in [[.
This commit is contained in:
François Revol
2013-09-29 03:01:39 +02:00
parent 56214e2b30
commit 4d65f429d0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/RepositoryRules
+5 -5
View File
@@ -279,7 +279,7 @@ actions BootstrapRepositoryFetchPackage1
# make Haiku cross devel package path absolute # make Haiku cross devel package path absolute
haikuCrossDevelPackage="$(2[1])" haikuCrossDevelPackage="$(2[1])"
if [[ "$haikuCrossDevelPackage" != /* ]]; then if [ "x$haikuCrossDevelPackage" = "x${haikuCrossDevelPackage#/}" ]; then
haikuCrossDevelPackage="`pwd`/$haikuCrossDevelPackage" haikuCrossDevelPackage="`pwd`/$haikuCrossDevelPackage"
fi fi
@@ -287,7 +287,7 @@ actions BootstrapRepositoryFetchPackage1
secondaryCrossDevelPackages= secondaryCrossDevelPackages=
if [ -n "$(2[2-]:J)" ]; then if [ -n "$(2[2-]:J)" ]; then
for secondaryCrossDevelPackage in "$(2[2-])" ; do for secondaryCrossDevelPackage in "$(2[2-])" ; do
if [[ "$secondaryCrossDevelPackage" != /* ]]; then if [ "x$secondaryCrossDevelPackage" = "x${secondaryCrossDevelPackage#/}" ]; then
secondaryCrossDevelPackage="`pwd`/$secondaryCrossDevelPackage" secondaryCrossDevelPackage="`pwd`/$secondaryCrossDevelPackage"
fi fi
if [ -n "$secondaryCrossDevelPackages" ]; then if [ -n "$secondaryCrossDevelPackages" ]; then
@@ -340,7 +340,7 @@ EOF
# If we have cross tools, add the cross tools directory. # If we have cross tools, add the cross tools directory.
gcc=$(HAIKU_CC_$(HAIKU_PACKAGING_ARCH)) gcc=$(HAIKU_CC_$(HAIKU_PACKAGING_ARCH))
if [[ "$gcc" = /* ]]; then if [ "x$gcc" != "x${gcc#/}" ]; then
if [ `basename $gcc` = \ if [ `basename $gcc` = \
$(HAIKU_GCC_MACHINE_$(HAIKU_PACKAGING_ARCH))-gcc ]; then $(HAIKU_GCC_MACHINE_$(HAIKU_PACKAGING_ARCH))-gcc ]; then
dir=`dirname $gcc` dir=`dirname $gcc`
@@ -560,7 +560,7 @@ actions BuildHaikuPortsSourcePackageDirectory1
# make Haiku cross devel package path absolute # make Haiku cross devel package path absolute
haikuCrossDevelPackage="$(2[2])" haikuCrossDevelPackage="$(2[2])"
if [[ "$haikuCrossDevelPackage" != /* ]]; then if [ "x$haikuCrossDevelPackage" = "x${haikuCrossDevelPackage#/}" ]; then
haikuCrossDevelPackage="`pwd`/$haikuCrossDevelPackage" haikuCrossDevelPackage="`pwd`/$haikuCrossDevelPackage"
fi fi
@@ -568,7 +568,7 @@ actions BuildHaikuPortsSourcePackageDirectory1
secondaryCrossDevelPackages= secondaryCrossDevelPackages=
if [ -n "$(2[3-]:J)" ]; then if [ -n "$(2[3-]:J)" ]; then
for secondaryCrossDevelPackage in "$(2[3-])" ; do for secondaryCrossDevelPackage in "$(2[3-])" ; do
if [[ "$secondaryCrossDevelPackage" != /* ]]; then if [ "x$secondaryCrossDevelPackage" = "x${secondaryCrossDevelPackage#/}" ]; then
secondaryCrossDevelPackage="`pwd`/$secondaryCrossDevelPackage" secondaryCrossDevelPackage="`pwd`/$secondaryCrossDevelPackage"
fi fi
if [ -n "$secondaryCrossDevelPackages" ]; then if [ -n "$secondaryCrossDevelPackages" ]; then