diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 03:19:17 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 03:19:17 -0300 |
| commit | d246da4bb04eee35189c79c8466c21ff86678e42 (patch) | |
| tree | c7167129c67a2d846adcca9245ebae134069aa8a /cron-jobs/ftpdir-cleanup | |
| parent | 6ce3ddee58415e052ec578e777994a60c7e4c3a3 (diff) | |
| parent | 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/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 |