Changeset 2083 for trunk/build/run-bitten.shTweet

Timestamp:

Nov 17, 2012, 3:36:59 PM (10 years ago)

Author:

sam

Message:

build: always use the same build directory in run-bitten.sh to
avoid leaving gigabytes of cruft behind us, and do our best to
clean up afterwards.

File:

• trunk/build/run-bitten.sh (modified) (4 diffs)

trunk/build/run-bitten.sh

@@ -1 +1 @@
 #!/bin/sh
 
-conffile="`mktemp 2>/dev/null`"
-if [ "$conffile" = "" ]; then
-    conffile="`mktemp -q /tmp/lol-bitten-XXXXXX`"
-fi
+conffile="`mktemp -q /tmp/lol-bitten-XXXXXXXX 2>/dev/null`"
+if [ "${conffile}" = "" ]; then
+    conffile="`mktemp 2>/dev/null`"
+fi
+builddir="/tmp/lol-bitten-`whoami`"
 url="http://lol.zoy.org/builds"
 
 append() {
-    echo "$*" >> "$conffile"
+    echo "$*" >> "${conffile}"
 }
+
+cleanup() {
+    rm -f "${conffile}"
+    rm -rf "${builddir}"
+}
+
+bailout() {
+    cleanup
+    # Exit gracefully
+    exit 0
+}
+
+trap bailout HUP INT QUIT ABRT KILL ALRM TERM
 
 #
@@ -17 +31 @@
 if [ "$#" != 2 ]; then
     echo "Usage: $0 <username> <password>"
+    exit 1
+fi
+
+#
+# Clean up working directory
+#
+cleanup
+if [ -e "${builddir}" ]; then
+    echo "Error: cannot get rid of ${builddir}"
     exit 1
 fi
@@ -180 +203 @@
 #
 
-cat "$conffile"
+cat "${conffile}"
 
 #
@@ -198 +221 @@
 
 while : ; do
-    bitten-slave "$url" -f "$conffile" --name "$name"
+    bitten-slave "$url" \
+        -f "${conffile}" \
+        --name "$name" \
+        --work-dir="${builddir}"
+    rm -rf "${builddir}"
     sleep 10
 done
 
-rm -f "$conffile"
-
+bailout
+