From 4d65f429d0b486504be7ae31033e5ad215e3f809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 29 Sep 2013 03:01:39 +0200 Subject: [PATCH] Fix bashisms Besides, at least one test was probably incorrect, trying to match /* with a single = in [[. --- build/jam/RepositoryRules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules index 066ace4a25..23e56dfd75 100644 --- a/build/jam/RepositoryRules +++ b/build/jam/RepositoryRules @@ -279,7 +279,7 @@ actions BootstrapRepositoryFetchPackage1 # make Haiku cross devel package path absolute haikuCrossDevelPackage="$(2[1])" - if [[ "$haikuCrossDevelPackage" != /* ]]; then + if [ "x$haikuCrossDevelPackage" = "x${haikuCrossDevelPackage#/}" ]; then haikuCrossDevelPackage="`pwd`/$haikuCrossDevelPackage" fi @@ -287,7 +287,7 @@ actions BootstrapRepositoryFetchPackage1 secondaryCrossDevelPackages= if [ -n "$(2[2-]:J)" ]; then for secondaryCrossDevelPackage in "$(2[2-])" ; do - if [[ "$secondaryCrossDevelPackage" != /* ]]; then + if [ "x$secondaryCrossDevelPackage" = "x${secondaryCrossDevelPackage#/}" ]; then secondaryCrossDevelPackage="`pwd`/$secondaryCrossDevelPackage" fi if [ -n "$secondaryCrossDevelPackages" ]; then @@ -340,7 +340,7 @@ EOF # If we have cross tools, add the cross tools directory. gcc=$(HAIKU_CC_$(HAIKU_PACKAGING_ARCH)) - if [[ "$gcc" = /* ]]; then + if [ "x$gcc" != "x${gcc#/}" ]; then if [ `basename $gcc` = \ $(HAIKU_GCC_MACHINE_$(HAIKU_PACKAGING_ARCH))-gcc ]; then dir=`dirname $gcc` @@ -560,7 +560,7 @@ actions BuildHaikuPortsSourcePackageDirectory1 # make Haiku cross devel package path absolute haikuCrossDevelPackage="$(2[2])" - if [[ "$haikuCrossDevelPackage" != /* ]]; then + if [ "x$haikuCrossDevelPackage" = "x${haikuCrossDevelPackage#/}" ]; then haikuCrossDevelPackage="`pwd`/$haikuCrossDevelPackage" fi @@ -568,7 +568,7 @@ actions BuildHaikuPortsSourcePackageDirectory1 secondaryCrossDevelPackages= if [ -n "$(2[3-]:J)" ]; then for secondaryCrossDevelPackage in "$(2[3-])" ; do - if [[ "$secondaryCrossDevelPackage" != /* ]]; then + if [ "x$secondaryCrossDevelPackage" = "x${secondaryCrossDevelPackage#/}" ]; then secondaryCrossDevelPackage="`pwd`/$secondaryCrossDevelPackage" fi if [ -n "$secondaryCrossDevelPackages" ]; then