Create a "common functions" file for DB scripts

Common functions, such as sourcing makepkg, and locking a repo

Additionally, repo-locking has been unified to prevent multiple
users from corrupting a repo (i.e. db-move run while db-remove
in progress)

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/testing2x b/testing2x
index 7096f1d..c385fd8 100755
--- a/testing2x
+++ b/testing2x
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-if [ -f "/etc/makepkg.conf" ]; then
-  . /etc/makepkg.conf
-else
-  echo "/etc/makepkg.conf does not exist!"
-  exit 1
-fi
+. "$(dirname $0)/db-functions"
+
+source_makepkg
 
 case "$0" in
   *64)
@@ -29,7 +26,7 @@ ctrl_c() {
 }
 
 trap ctrl_c 2
-trap cleanup 0
+trap cleanup 0 1
 
 cd "${WORKDIR}"
 /usr/bin/svn checkout -N ${svnpath} checkout