diff options
author | Aaron Griffin <aaronmgriffin@gmail.com> | 2009-01-14 22:37:23 +0100 |
---|---|---|
committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2009-01-14 22:37:23 +0100 |
commit | 6e0ea2deb4f28baeebef2c549c30daee60f8e8d7 (patch) | |
tree | 9435980a4ad6367b8118eaedac330b306d788741 /db-move | |
parent | 3fb6203f79434d48954f6ef3c5be7067beaccd86 (diff) | |
parent | 5f64e9993a494040b0280ed0f1daa38f68f9c46b (diff) | |
download | dbscripts-6e0ea2deb4f28baeebef2c549c30daee60f8e8d7.tar.gz dbscripts-6e0ea2deb4f28baeebef2c549c30daee60f8e8d7.tar.xz |
Merge branch 'master' of file:///srv/projects/git/dbscripts
Conflicts:
db-update
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'db-move')
-rwxr-xr-x | db-move | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -84,23 +84,18 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then # copy the db file into our working area if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then /bin/cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" . - else - touch "$repofrom.db.tar.$DB_COMPRESSION" + /usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove" + #use '*' to move the old DB too + mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from + echo " Package files will be cleaned up automatically" fi - /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove" - #use '*' to move the old DB too - mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from - echo " Package files will be cleaned up automatically" - if [ -f "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" ]; then /bin/cp "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" . - else - touch "$repoto.db.tar.$DB_COMPRESSION" fi /bin/cp "$ftppath_from/$_pkgfile" . - /usr/bin/repo-add "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add" + /usr/bin/repo-add -q "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add" #use '*' to move the old DB too mv $repoto.db.tar.$DB_COMPRESSION* $_pkgfile $ftppath_to else |