hcoop-backup: Implement copy_over.

diff --git a/hcoop-backup b/hcoop-backup
index 9ecad5d..6308105 100755 (executable)
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -22,17 +22,20 @@ IFS=$'\n'
 
 SCRIPTDIR=$(dirname $0)
 KEYFILE=/etc/backup-encryption-key
-BACKUPDIR=/hcoop.net-backups
+BUCKET=hcoop.net-backups
+BACKUPDIR=full
 BACKUPTMP=/var/backups/hcoop-backup-testing
-SUBDIR=`date +%Y.%m.%d`
+SUBDIR=$(date +%Y.%m.%d)
 
-S3_ACCESS_KEY=$(cat ~mwolson_admin/.amazon/access.key)
-S3_SECRET_KEY_FILE=~mwolson_admin/.amazon/secret.key
+export S3_ACCESS_KEY_ID=$(cat ~mwolson_admin/.amazon/access.key)
+export S3_SECRET_ACCESS_KEY=~mwolson_admin/.amazon/secret.key
 
 function s3_cmd () {
-    local cmd=$1
-    shift
-    $SCRIPTDIR/s3-$cmd -k $S3_ACCESS_KEY -s $S3_SECRET_KEY_FILE $@
+    # $1: command (get|put|ls|rm)
+    # $2: bucket
+    # $3: destination
+    # $4: source file
+    $SCRIPTDIR/s3 $1 $2 $3 $4 ${BWLIMIT}K
 }
 
 function copy_over () {
@@ -47,7 +50,7 @@ function copy_over () {
     if test -n "$2"; then
         DEST=$DEST/$2
     fi
-    s3_cmd put -b ${BWLIMIT}K -T $FILE $DEST/$FILE
+    s3_cmd put $BUCKET $DEST/$FILE $FILE
     rm -f $FILE
 }