commit bbeda2d62c42637bc218e5de0fc3471bfd0cf5c0
author Jeff Gaston <jeffrygaston@google.com> Tue May 26 13:14:15 2020 -0400
committer Jeff Gaston <jeffrygaston@google.com> Tue May 26 16:33:12 2020 -0400
tree da989f9bf4d47129e7b21d56e9a928e0414a8866
parent 4731db3c0c1c88bfe32a73250d28318d7569f162

Some usability adjustments in update.sh

  Making it halt on error
  Removing the need to run lunch first
  Removing the empty staging dir

Bug: 155906507
Test: ./update.sh 6508549

Change-Id: Ic2fdc664f73d3249a2de45d6c99e99edd7400171

update.sh

diff --git a/update.sh b/update.sh
index ae9590f..858ff57 100755
--- a/update.sh
+++ b/update.sh
@@ -1,10 +1,10 @@
-#!/bin/bash -v
+#!/bin/bash -ev
 
 # Updates prebuilts/jdk/jdk11 from build server.
 # Usage:
-#    $ cd <REPO>/prebuilts/jdk/jdk11
+#    $ cd <REPO>
 #    $ repo start jdk11_update .
-#    $ update-jdk11.sh <BUILD_NUMBER>
+#    $ prebuilts/jdk/jdk11/update-jdk11.sh <BUILD_NUMBER>
 #    $ repo upload --cbr .
 
 
@@ -13,7 +13,7 @@
 DARWIN_ZIP=/tmp/$$.darwin.zip
 
 FETCH_ARTIFACT=/google/data/ro/projects/android/fetch_artifact
-cd "${ANDROID_BUILD_TOP:?ANDROID_BUILD_TOP must be set, run lunch first}"/prebuilts/jdk/jdk11
+cd "$(dirname $0)"
 
 rm -rf staging
 mkdir -p staging
@@ -44,4 +44,5 @@
 
 git rm -rf linux-x86 darwin-x86 manifest.xml
 git mv staging/* .
+rmdir staging
 git commit -m "Switch to JDK $version" --edit