s3.common: Get rid of third argument to move_over.

diff --git a/s3.common b/s3.common
index 01a4497..87338c6 100644 (file)
--- a/s3.common
+++ b/s3.common
@@ -34,17 +34,13 @@ function move_over () {
     # Expects the file to come from STDIN.
     # $1: date subdirectory
     # $2: filename
     # Expects the file to come from STDIN.
     # $1: date subdirectory
     # $2: filename

-    # $3: relative directory (optional)
-    if test -z "$2" || test -n "$4"; then
+    if test -z "$2" || test -n "$3"; then

         echo "Bad programming"
         exit 1
     fi
     local subdir=$1
     local file=$2
     local dest=$BACKUPDIR/$subdir
         echo "Bad programming"
         exit 1
     fi
     local subdir=$1
     local file=$2
     local dest=$BACKUPDIR/$subdir

-    if test -n "$2"; then
-        dest=$dest/$2
-    fi

     split -d -b ${CHUNKSIZE}m - ${file}.
     for i in ${file}.*; do
         s3_cmd put $dest/$i $i
     split -d -b ${CHUNKSIZE}m - ${file}.
     for i in ${file}.*; do
         s3_cmd put $dest/$i $i