diff options
author | Eric BĂ©langer <snowmaniscool@gmail.com> | 2009-08-19 01:37:09 +0200 |
---|---|---|
committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2009-08-19 01:37:09 +0200 |
commit | a4d0a6cba591e0866c249a0c2014297bdbbfb779 (patch) | |
tree | abe246ca2c2768ca1f1714c4b19d24bf9a790842 | |
parent | b40d217f2baf30f5d7c5979618ff940e43636007 (diff) | |
download | dbscripts-a4d0a6cba591e0866c249a0c2014297bdbbfb779.tar.gz dbscripts-a4d0a6cba591e0866c249a0c2014297bdbbfb779.tar.xz |
Fix arch parameter handling in db-remove
db-remove use the arch variable to handle the arch parameter passed to the
script. As the arch variable is already used in PKGBUILD, this variable
conflict cause unwanted behaviour.
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-x | db-remove | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -9,10 +9,10 @@ fi packagebase="$1" reponame="$2" -arch="$3" +_arch="$3" ftppath="$FTP_BASE/$reponame/os" -svnrepo="$reponame-$arch" +svnrepo="$reponame-$_arch" [ "$UID" = "" ] && UID=$(uid) @@ -21,7 +21,7 @@ WORKDIR="$TMPDIR/db-remove.$svnrepo.$UID" cleanup() { trap '' 0 2 # unlock - repo_unlock $reponame $arch + repo_unlock $reponame $_arch rm -rf "$WORKDIR" [ "$1" ] && exit $1 } @@ -39,7 +39,7 @@ die() { trap ctrl_c 2 trap cleanup 0 -repo_lock $reponame $arch +repo_lock $reponame $_arch /bin/mkdir -p "$WORKDIR" @@ -66,10 +66,10 @@ fi cd "$WORKDIR" [ -d build/ ] || mkdir build -if [ "$arch" == "any" ]; then +if [ "$_arch" == "any" ]; then arches="i686 x86_64" else - arches="$arch" + arches="$_arch" fi # copy the db file into our working area |