aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2016-03-29 23:56:20 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2016-03-30 12:02:11 +0800
commitff6f79243008a8ae8c922b345fd7ff0fd3a37c3a (patch)
tree184f827d66f3ee4fad664dd647d64f4c9e95a9e2
parenta3e886e55c23179361f5c65d9fd2c39ab5f1cfb4 (diff)
downloadlinaro-android-build-tools-ff6f79243008a8ae8c922b345fd7ff0fd3a37c3a.tar.gz
create-user-build-script: fix problem when pinned-manifest.xml specified
only run the sed command for local_manifests files with the same condition as it was cloned Change-Id: I61713509605ad704a7303f663d417b0a9a9feebe Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rwxr-xr-xbuild-scripts/create-user-build-script8
1 files changed, 5 insertions, 3 deletions
diff --git a/build-scripts/create-user-build-script b/build-scripts/create-user-build-script
index 1b0a6d7..3cc2fc7 100755
--- a/build-scripts/create-user-build-script
+++ b/build-scripts/create-user-build-script
@@ -112,9 +112,9 @@ echo "Press "y" to install OpenJDK v1.7, OR"
echo "Press "n" to install OpenJDK v1.6, OR"
echo "Press any other key to continue with the existing JDK installation."
read JDK
-if [ \${JDK} == y ] ; then
+if [ "\${JDK}" == y ] ; then
PKGS+=' openjdk-7-jdk openjdk-7-jre'
-elif [ \${JDK} == n ] ; then
+elif [ "\${JDK}" == n ] ; then
PKGS+=' openjdk-6-jdk openjdk-6-jre'
else
echo "Continue with the existing JDK installation .."
@@ -297,7 +297,9 @@ if [ \${PRI} -gt 0 -a \${INTERACTIVE} -eq 1 ] ; then
fi
fi
sed -i 's/\/\/.*-bot@/\/\/'"\${LINARO_ANDROID_ACCESS_ID}"'@/' .repo/manifest.xml
- sed -i 's/\/\/.*-bot@/\/\/'"\${LINARO_ANDROID_ACCESS_ID}"'@/' .repo/local_manifests/*.xml
+ if [[ -n \${LOCAL_MANIFEST} && ! -n \${MANIFEST} ]]; then
+ sed -i 's/\/\/.*-bot@/\/\/'"\${LINARO_ANDROID_ACCESS_ID}"'@/' .repo/local_manifests/*.xml
+ fi
fi
./repo sync -f -j1