1 files changed, 2 insertions, 25 deletions
diff --git a/misc-scripts/sourceballs-cleanup b/misc-scripts/sourceballs-cleanup
index c87a888..e058c38 100755
--- a/misc-scripts/sourceballs-cleanup
+++ b/misc-scripts/sourceballs-cleanup
@@ -6,19 +6,7 @@
 srcpath="$FTP_BASE/sources/"
 logfile="$srcpath/cleanup.txt"
 
-LOCKFILE="/tmp/.sourceball-cleanup.lock"
-
-cleanup () {
-    restore_umask
-    rm -rf "$WORKDIR"
-    rm -f "$LOCKFILE"
-    exit 0
-}
-
-ctrl_c() {
-    echo "Interrupted" >&2
-    cleanup 0
-}
+script_lock
 
 remove_old() {
     if [ -d "$1" ]; then
@@ -52,17 +40,6 @@ remove_old() {
     fi
 }
 
-if [ -f "$LOCKFILE" ]; then
-    owner="$(/usr/bin/stat -c %U $LOCKFILE)"
-    echo "error: source tarball generation is already in progress (started by $owner)"
-    exit 1
-fi
-
-trap cleanup 0
-trap ctrl_c 2
-
-/bin/touch "$LOCKFILE"
-
 #adjust the nice level to run at a lower priority
 /usr/bin/renice +10 -p $$ > /dev/null
 
@@ -91,4 +68,4 @@ for sourceball in "$srcpath"/*$SRCEXT; do
     fi
 done
 
-cleanup 0
+script_unlock