devops: simplified bash traps

browser_patches/do_checkout.sh

@@ -2,13 +2,8 @@
 set -e
 set +x
 
-function cleanup() {
+trap "cd $(pwd -P)" EXIT
-  cd $OLD_DIR
-}
-
-OLD_DIR=$(pwd -P)
 cd "$(dirname "$0")"
-trap cleanup EXIT
 
 if [[ ($1 == '--help') || ($1 == '-h') ]]; then
   echo "usage: do_something.sh [firefox|webkit]"

browser_patches/export.sh

@@ -2,13 +2,8 @@
 set -e
 set +x
 
-cleanup() {
+trap "cd $(pwd -P)" EXIT
-  cd $OLD_DIR
-}
-
-OLD_DIR=$(pwd -P)
 cd "$(dirname "$0")"
-trap cleanup EXIT
 
 if [[ ($1 == '--help') || ($1 == '-h') ]]; then
   echo "usage: export.sh [firefox|webkit] [custom_checkout_path]"

browser_patches/firefox/archive.sh

@@ -12,7 +12,6 @@ set -e
 set -x
 
 createZIPForLinuxOrMac() {
-  cd checkout
   local zipname=$1
   local OBJ_FOLDER=$(ls -1 | grep obj-)
   if [[ $OBJ_FOLDER == "" ]]; then
@@ -35,13 +34,8 @@ createZIPForLinuxOrMac() {
   cd -
 }
 
-cleanup() {
+trap "cd $(pwd -P)" EXIT
-  cd $OLD_DIR
+cd checkout
-}
-
-OLD_DIR=$(pwd -P)
-cd "$(dirname "$0")"
-trap cleanup EXIT
 
 if [[ "$(uname)" == "Darwin" ]]; then
   createZIPForLinuxOrMac "firefox-mac.zip"

browser_patches/firefox/build.sh

@@ -2,14 +2,7 @@
 set -e
 set +x
 
-function cleanup() {
+trap "cd $(pwd -P)" EXIT
-  cd $OLD_DIR
-}
-
-OLD_DIR=$(pwd -P)
-cd "$(dirname "$0")"
-trap cleanup EXIT
-
 cd checkout
 
 if ! [[ $(git rev-parse --abbrev-ref HEAD) == "pwdev" ]]; then

browser_patches/upload.sh

@@ -2,13 +2,8 @@
 set -e
 set +x
 
-cleanup() {
+trap "cd $(pwd -P)" EXIT
-  cd $OLD_DIR
-}
-
-OLD_DIR=$(pwd -P)
 cd "$(dirname "$0")"
-trap cleanup EXIT
 
 if [[ ($1 == '--help') || ($1 == '-h') ]]; then
   echo "usage: $0 [firefox|webkit]"

browser_patches/webkit/archive.sh

@@ -75,11 +75,7 @@ createZipForMac() {
   rm -rf $tmpdir
 }
 
-cleanup() {
+trap "cd $(pwd -P)" EXIT
-  cd $OLD_DIR
-}
-
-OLD_DIR=$(pwd -P)
 cd "$(dirname "$0")"
-trap cleanup EXIT
+
 main "$@"

browser_patches/webkit/build.sh

@@ -2,14 +2,7 @@
 set -e
 set +x
 
-function cleanup() {
+trap "cd $(pwd -P)" EXIT
-  cd $OLD_DIR
-}
-
-OLD_DIR=$(pwd -P)
-cd "$(dirname "$0")"
-trap cleanup EXIT
-
 cd checkout
 
 if ! [[ $(git rev-parse --abbrev-ref HEAD) == "pwdev" ]]; then