Merge lp:~pundiramit/linaro-android-build-tools/user-script into lp:linaro-android-build-tools

[Amit Pundir]

Last patches did not take care of escaping shell variables, which resulted in broken shell script e.g. https://snapshots.linaro.org/android/~linaro-android-restricted/vexpress-tc2-isw-jb-gcc47-armlt-stable-open-linaro-android-12.12-iks-release/4/linaro_android_build_cmds.sh. Fixing that.

[Данило Шеган (danilo)]

Looks good, thanks.

review: Approve

=== modified file 'build-scripts/create-user-build-script'
--- build-scripts/create-user-build-script	2012-12-17 09:46:00 +0000
+++ build-scripts/create-user-build-script	2012-12-19 16:22:38 +0000
@@ -58,19 +58,19 @@
         esac
 done
 
-UBUNTU=`cat /etc/issue.net | cut -d' ' -f2`
-HOST_ARCH=`uname -m`
-if [ $HOST_ARCH == "x86_64" ] ; then
+UBUNTU=\`cat /etc/issue.net | cut -d' ' -f2\`
+HOST_ARCH=\`uname -m\`
+if [ \${HOST_ARCH} == "x86_64" ] ; then
 	PKGS='git-core gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev g++-multilib mingw32 tofrodos python-markdown libxml2-utils xsltproc uboot-mkimage openjdk-6-jdk openjdk-6-jre vim-common'
 else
 	echo "ERROR: Only 64bit Host(Build) machines are supported at the moment."
 	exit 1
 fi
-if [ $UBUNTU == "12.10" ]; then
-	PKGS+=' lib32readline-gplv2-dev'
-elif [ $UBUNTU == "12.04" ] ; then
-	PKGS+=' lib32readline-gplv2-dev'
-elif [ $UBUNTU == "10.04" ] ; then
+if [ \${UBUNTU} == "12.10" ]; then
+	PKGS+=' lib32readline-gplv2-dev'
+elif [ \${UBUNTU} == "12.04" ] ; then
+	PKGS+=' lib32readline-gplv2-dev'
+elif [ \${UBUNTU} == "10.04" ] ; then
 	PKGS+=' ia32-libs lib32readline5-dev'
 else
 	echo
@@ -79,7 +79,7 @@
 fi
 
 echo "Checking and installing missing dependencies if any .. .."
-sudo apt-get install $PKGS
+sudo apt-get install \${PKGS}
 
 MISSING=\`dpkg-query -W -f='\${Status}\n' \${PKGS} 2>&1 | grep 'No packages found matching' | cut -d' ' -f5\`
 if [ -n "\$MISSING" ] ; then
@@ -177,22 +177,22 @@
 	$CP_CMD
 fi
 # check for linaro private git repositories
-PRI=`grep -i "linaro-private" .repo/manifests/${MANIFEST_FILENAME} | wc -l`
-if [ $PRI -gt 0 ] ; then
-	if [ "$ID" == "default-bot" ] ; then
+PRI=\`grep -i "linaro-private" .repo/manifests/\${MANIFEST_FILENAME} | wc -l\`
+if [ \${PRI} -gt 0 ] ; then
+	if [ "\${ID}" == "default-bot" ] ; then
 		echo "You must specify valid login/access-id to clone from linaro-private git repositories."
 		echo "Press "y" to continue (which may result in incomplete build), OR"
 		echo "Press "n" to enter login details, OR"
 		echo "Press "h" for help."
 		read NEXT
-		if [ ${NEXT} == n ] ; then
+		if [ \${NEXT} == n ] ; then
 			echo "Enter login/access-id:"
 			read ID
-		elif [ ${NEXT} == h ] ; then
+		elif [ \${NEXT} == h ] ; then
 			usage
 		fi
 	fi
-	sed -i 's/\/\/.*-bot@/\/\/'"$ID"'@/' .repo/manifests/${MANIFEST_FILENAME}
+	sed -i 's/\/\/.*-bot@/\/\/'"\${ID}"'@/' .repo/manifests/\${MANIFEST_FILENAME}
 fi
 ./repo sync