Move common function to db-functions

db-functions now sets an individual $WORKDIR and implements trap functinos that
remove locks on exit or error. There are new functions to lock and unlock the running script.

misc-scripts/ftpdir-cleanup was renamed to ftpdir-cleanup-repo as the cron-job had the same name.
Script names have to be unique when using db-functions.

1 files changed, 0 insertions, 22 deletions

diff --git a/db-update b/db-update
index e53aee8..f971a6f 100755
--- a/db-update
+++ b/db-update
@@ -33,26 +33,6 @@ if [ ! -d $stagedir ]; then
 	exit 1
 fi
 
-cleanup() {
-    trap '' 0 2
-	repo_unlock $reponame $current_arch
-	rm -rf "$WORKDIR"
-	[ "$1" ] && exit $1
-}
-
-ctrl_c() {
-	echo "Interrupted" >&2
-	cleanup 1
-}
-
-die() {
-	echo "$*" >&2
-	cleanup 1
-}
-
-trap ctrl_c 2
-trap cleanup 0
-
 echo -n "Updating $reponame..."
 
 # Remove any package from $stagedir that is already in the FTP repository
@@ -238,6 +218,4 @@ fi
 
 echo 'done'
 
-trap '' 0 2
-rm -rf $WORKDIR
 # vim: set ts=4 sw=4 noet ft=sh: