diff options
author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2012-02-20 12:30:00 +0200 |
---|---|---|
committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2012-02-20 12:30:00 +0200 |
commit | b347dc1ebe52fc13778ccb3f4229795277ae2046 (patch) | |
tree | aa58b24be9b849b9855ab56adde03a5a20e381f3 /node/setup-build-android | |
parent | 4412b783b5211976086c5ddc5ea1f609f13e989b (diff) |
Use exactly same magic command for java dpkg install as was for apt-get.
Diffstat (limited to 'node/setup-build-android')
-rwxr-xr-x | node/setup-build-android | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/setup-build-android b/node/setup-build-android index 733f239..d2374eb 100755 --- a/node/setup-build-android +++ b/node/setup-build-android @@ -26,7 +26,7 @@ wget http://android-build.linaro.org/seed/sun-java6-bin_6.26-2natty1_amd64.deb \ export DEBIAN_FRONTEND=noninteractive ##apt-get install -y sun-java6-jdk || (debconf 'echo SET shared/accepted-sun-dlj-v1-1 true' || true; apt-get install -f -y; apt-get install -y sun-java6-jdk) -(debconf 'echo SET shared/accepted-sun-dlj-v1-1 true' || true; apt-get install -f -y; dpkg -i sun-java6-jdk* sun-java6-jre* sun-java6-bin*) +dpkg -i sun-java6-* || (debconf 'echo SET shared/accepted-sun-dlj-v1-1 true' || true; apt-get install -f -y; dpkg -i sun-java6-*) # set java-6-sun as default update-java-alternatives -s java-6-sun || true |