diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-04-16 14:05:43 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-04-16 14:05:43 -0500 |
| commit | 0bb0476a6cff7b5ad79c518bcb95c6ee170b0ac9 (patch) | |
| tree | c327ff49f49200ddc184a4e1a2f1aee7144c4c87 /cron-jobs/ftpdir-cleanup | |
| parent | 375f87c696cb7838c17922a83e956adbec8ef414 (diff) | |
| parent | 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/dbscripts
Conflicts:
db-functions
Diffstat (limited to 'cron-jobs/ftpdir-cleanup')
| -rwxr-xr-x | cron-jobs/ftpdir-cleanup | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup index 09e8a49..bb1661a 100755 --- a/cron-jobs/ftpdir-cleanup +++ b/cron-jobs/ftpdir-cleanup @@ -10,9 +10,12 @@ clean_pkg() { if ! ${CLEANUP_DRYRUN}; then for pkg in "$@"; do if [ -h "$pkg" ]; then - rm -f "$pkg" + rm -f "$pkg" "$pkg.sig" else mv -f "$pkg" "$CLEANUP_DESTDIR" + if [ -e "$pkg.sig" ]; then + mv -f "$pkg.sig" "$CLEANUP_DESTDIR" + fi touch "${CLEANUP_DESTDIR}/$(basename ${pkg})" fi done @@ -100,7 +103,10 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then msg "Removing old packages from the cleanup directory..." for old_pkg in ${old_pkgs[@]}; do msg2 "${old_pkg}" - ${CLEANUP_DRYRUN} || rm -f "${CLEANUP_DESTDIR}/${old_pkg}" + if ! ${CLEANUP_DRYRUN}; then + rm -f "${CLEANUP_DESTDIR}/${old_pkg}" + rm -f "${CLEANUP_DESTDIR}/${old_pkg}.sig" + fi done fi |