Replace lftp's call to 'rmdir' by calls to 'rm -rf'.

[brioche.git] / brioche

diff --git a/brioche b/brioche
index 8e0597af7eb4dd503e769cd8da7402fd4a9cd88c..ca4501d9c167fd688e6faf93da33af68a530f083 100755 (executable)
--- a/brioche
+++ b/brioche
@@ -294,7 +294,7 @@ ftp_rotate()
   # Build commands
   # Remove oldest run
   if [ "$FTP_KEEP" != "0" ]; then
-    commands="$commands; rmdir ${lastrun}"
+    commands="$commands; rm -rf ${lastrun}"
 
     # Move everything back
     for run in `seq $FTP_KEEP -1 2`; do
@@ -305,7 +305,7 @@ ftp_rotate()
     # Move "old latest" to run-1
     commands="$commands; mv latest run-1"
   else
-    commands="$commands; rmdir latest"
+    commands="$commands; rm -rf latest"
   fi
 
   # Create "new latest" directory
@@ -361,6 +361,10 @@ case "$COMPRESS" in
   lzma)
     COMPRESS_OPT="--lzma"
     ;;
+  none)
+    COMPRESS_OPT=""
+    COMPRESS=""
+    ;;
   *)
     summary "Unknown compression method: ${COMPRESS}. Falling back to gzip."
     COMPRESS="gz"