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

[Amit Pundir]

Updated linaro_android_build_cmds.sh script to use absolute path of pinned-manifest file. If a user pass relative path of pinned-manifest file while invoking l_a_b_c.sh then it will fail and exit while copying pinned-manifest.xml.

[lp:~pundiramit/linaro-android-build-tools/labc_pm]

621. By Amit Pundir on 2013-05-28

create-user-build-script: use == for string comparison and fix a typo

[Milo Casagrande (milo)]

Looks good to me.
+1

review: Approve

=== modified file 'build-scripts/create-user-build-script'
--- build-scripts/create-user-build-script	2013-05-24 15:34:43 +0000
+++ build-scripts/create-user-build-script	2013-05-28 08:50:34 +0000
@@ -17,7 +17,7 @@
 	USAGE_SUM="'Usage: \$0 -m <manifest.xml> -o <overlay.tar> [ -t -d directory -l login ]'"
 	USAGE_OVERLAY="'\\n -m <manifest>    If -t is not used, then using a browser with cookies you\\n                  must download the pinned manifest from:\\n             $PINNED_MANIFEST_URL\\n -o               The path to the vendor required overlay.\\n                  Can be downloaded from http://snapshots.linaro.org/android/binaries/$SOURCE_OVERLAY\\n'"
 	USAGE_OPTOVERLAY="m:o:"
-	USAGE_OPTHANDLER="o   ) SOURCE_OVERLAY=\$OPTARG; SOURCE_OVERLAY_OPTIONAL=0;;  m   ) MANIFEST=\$OPTARG;;"
+	USAGE_OPTHANDLER="o   ) SOURCE_OVERLAY=\$OPTARG; SOURCE_OVERLAY_OPTIONAL=0;;  m   ) MANIFEST=\`readlink -f \$OPTARG\`;;"
 else
 	USAGE_SUM="'Usage: \$0 [ -t -d directory -l login ]'"
 fi
@@ -64,7 +64,7 @@
         esac
 done
 
-if [ \${LINARO_ANDROID_ACCESS_ID} -eq "default-bot" -a \${INTERACTIVE} -eq 0 ] ; then
+if [ "\${LINARO_ANDROID_ACCESS_ID}" == "default-bot" -a \${INTERACTIVE} -eq 0 ] ; then
     usage
 fi
 
@@ -83,7 +83,7 @@
 	PKGS+=' libstdc++6:i386 git-core'
 elif [[ \${UBUNTU} =~ "12.04" || \${UBUNTU} =~ "10.04" ]] ; then
 	#Install basic dev package missing in chrooted environments
-	suod apt-get install python-software-properties
+	sudo apt-get install python-software-properties
 	if [[ \${UBUNTU} =~ "12.04" ]]; then
 		PKGS+=' libstdc++6:i386 git-core'
 	else