Improves the jam-to-bash conversion in ReplaceComparators(). Fixes the
"[: 5: unary operator" aspect of #5685. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36204 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -47,6 +47,7 @@ HAIKU_GCC_VERSION[1]=${HAIKU_GCC_VERSION[1]}
|
|||||||
isHybridBuild=${isHybridBuild}
|
isHybridBuild=${isHybridBuild}
|
||||||
TARGET_ARCH=${TARGET_ARCH}
|
TARGET_ARCH=${TARGET_ARCH}
|
||||||
HAIKU_IMAGE_HOST_NAME=`uname -n`
|
HAIKU_IMAGE_HOST_NAME=`uname -n`
|
||||||
|
HAIKU_INCLUDE_SOURCES=0
|
||||||
$urlLine
|
$urlLine
|
||||||
$sslPkgLine
|
$sslPkgLine
|
||||||
$sslUrlLine
|
$sslUrlLine
|
||||||
@@ -545,7 +546,7 @@ function ConvertJamToBash()
|
|||||||
|
|
||||||
ConvertIfStatements "$line"
|
ConvertIfStatements "$line"
|
||||||
ConvertVariables "$line"
|
ConvertVariables "$line"
|
||||||
ReplaceComparators "$line"
|
#ReplaceComparators "$line"
|
||||||
|
|
||||||
line=${line/"IsOptionalHaikuImagePackageAdded"/'"SomeText" !='}
|
line=${line/"IsOptionalHaikuImagePackageAdded"/'"SomeText" !='}
|
||||||
generatedBash[$countGenBashLine]=${line}
|
generatedBash[$countGenBashLine]=${line}
|
||||||
@@ -638,6 +639,7 @@ function ConvertIfStatements()
|
|||||||
line=${line/"$compound"/"] $compound ["}
|
line=${line/"$compound"/"] $compound ["}
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
ReplaceComparators "$line"
|
||||||
fi
|
fi
|
||||||
# Assume all remaining closing braces are part of if statements
|
# Assume all remaining closing braces are part of if statements
|
||||||
line=${line/'}'/'fi'}
|
line=${line/'}'/'fi'}
|
||||||
@@ -670,6 +672,7 @@ function ReplaceComparators()
|
|||||||
line=${line//'>'/'-gt'}
|
line=${line//'>'/'-gt'}
|
||||||
line=${line//'<'/'-lt'}
|
line=${line//'<'/'-lt'}
|
||||||
line=${line//'!='/'-ne'}
|
line=${line//'!='/'-ne'}
|
||||||
|
line=${line//'='/'-eq'}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user