Move scripts into a separate directory

Karl Rieb · Karl Rieb · commit c49275e0d479 · 2016-07-29T14:22:26.000-07:00
diff --git a/scripts/diff-generated-sources b/scripts/diff-generated-sources
diff --git a/scripts/export-generated b/scripts/export-generated
@@ -121,6 +121,7 @@ def main():
     """The entry point for the program."""
 
     args = _cmdline_parser.parse_args()
+    cwd = os.path.dirname(__file__)
     repo_path = args.repo_path
     def log(msg):
         if args.verbose:
@@ -156,18 +157,18 @@ def main():
     for filename in get_files_in_repo('.', exclude_ignored_files=True):
         target = os.path.join(repo_path, filename)
         log('Copying %s to %s' % (filename, target))
-        subprocess.check_call(['rsync', '-R', filename, repo_path])
+        subprocess.check_call(['rsync', '-R', filename, repo_path], cwd=cwd)
 
     # Generate source files and copy across to the public repo.
     log('Regenerating source files')
-    subprocess.check_call(['rm', '-rf', 'build/generated-sources'])
+    subprocess.check_call(['rm', '-rf', 'build/generated-sources'], cwd=cwd)
     subprocess.check_output(['./run-stone-codegen'])
 
     target_path = os.path.join(repo_path, 'src/main/java/com/')
     log('Copying generated sources to ' + target_path)
     subprocess.check_call(['rsync', '-r',
                            'build/generated-sources/stone/com/',
-                           target_path])
+                           target_path], cwd=cwd)
 
     # Modify the gradle.build for the public repo
     log('Modifying gradle.build for the public repo.')
diff --git a/scripts/release-check b/scripts/release-check
@@ -1,12 +1,16 @@
-#!/bin/bash
-
-DIR=`dirname "${BASE_SOURCE[0]}"`
+#!/usr/bin/env bash
 
 die() {
     echo >&2 "error: release checks failed"
     exit 1
 }
 
+# Exit immediately on any error.
+set -eufo pipefail
+trap die SIGTERM
+
+DIR=`dirname "${BASE_SOURCE[0]}"`
+
 run() {
     echo "================================================================================"
     echo "    CMD: $@"
@@ -51,9 +55,6 @@ if [ ! -f "${AUTH_FILE}" ] ; then
     exit 1
 fi
 
-trap 'die' ERR
-trap 'die' SIGTERM
-
 echo "Running release checks..."
 echo ""
 echo "A series of tests will be performed to verify package is ready for release."
