From ad81683e483055391754e584c4845ec1b97f7561 Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Mon, 12 Apr 2010 21:48:18 +0000
Subject: [PATCH] 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
---
 data/bin/installoptionalpackage | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage
index 5f948de040..ef60706181 100755
--- a/data/bin/installoptionalpackage
+++ b/data/bin/installoptionalpackage
@@ -47,6 +47,7 @@ HAIKU_GCC_VERSION[1]=${HAIKU_GCC_VERSION[1]}
 isHybridBuild=${isHybridBuild}
 TARGET_ARCH=${TARGET_ARCH}
 HAIKU_IMAGE_HOST_NAME=`uname -n`
+HAIKU_INCLUDE_SOURCES=0
 $urlLine
 $sslPkgLine
 $sslUrlLine
@@ -545,7 +546,7 @@ function ConvertJamToBash()
 		
 		ConvertIfStatements "$line"
 		ConvertVariables "$line"
-		ReplaceComparators "$line"
+		#ReplaceComparators "$line"
 		
 		line=${line/"IsOptionalHaikuImagePackageAdded"/'"SomeText" !='}
 		generatedBash[$countGenBashLine]=${line}
@@ -638,6 +639,7 @@ function ConvertIfStatements()
 				line=${line/"$compound"/"] $compound ["}
 			fi
 		done
+		ReplaceComparators "$line"
 	fi
 	# Assume all remaining closing braces are part of if statements
 	line=${line/'}'/'fi'}
@@ -670,6 +672,7 @@ function ReplaceComparators()
 		line=${line//'>'/'-gt'}
 		line=${line//'<'/'-lt'}
 		line=${line//'!='/'-ne'}
+		line=${line//'='/'-eq'}
 	fi
 }