diff --git a/src/backups.js b/src/backups.js index 5a69108e6..dbd89e8b0 100644 --- a/src/backups.js +++ b/src/backups.js @@ -397,9 +397,12 @@ function createNewBackup(app, addonsToBackup, callback) { debugApp(app, 'backupApp: backup url:%s backup config url:%s', result.s3DataUrl, result.s3ConfigUrl); + var args = [ app.id, result.s3ConfigUrl, result.s3DataUrl, result.accessKeyId, result.secretAccessKey, + result.sessionToken, result.region, result.backupKey ]; + async.series([ addons.backupAddons.bind(null, app, addonsToBackup), - shell.sudo.bind(null, 'backupApp', [ BACKUP_APP_CMD, result.s3ConfigUrl, result.s3DataUrl, result.accessKeyId, result.secretAccessKey, result.sessionToken, result.region, result.backupKey ]), + shell.sudo.bind(null, 'backupApp', [ BACKUP_APP_CMD ].concat(args)), ], function (error) { if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error)); diff --git a/src/scripts/backupapp.sh b/src/scripts/backupapp.sh index 5b9076f16..4edcee90e 100755 --- a/src/scripts/backupapp.sh +++ b/src/scripts/backupapp.sh @@ -12,21 +12,22 @@ if [[ $# == 1 && "$1" == "--check" ]]; then exit 0 fi -if [ $# -lt 7 ]; then - echo "Usage: backupapp.sh " +if [ $# -lt 8 ]; then + echo "Usage: backupapp.sh " exit 1 fi readonly DATA_DIR="${HOME}/data" # env vars used by the awscli -s3_config_url="$1" -s3_data_url="$2" -export AWS_ACCESS_KEY_ID="$3" -export AWS_SECRET_ACCESS_KEY="$4" -export AWS_SESSION_TOKEN="$5" -export AWS_DEFAULT_REGION="$6" -password="$7" +readonly app_id="$1" +readonly s3_config_url="$2" +readonly s3_data_url="$3" +export AWS_ACCESS_KEY_ID="$4" +export AWS_SECRET_ACCESS_KEY="$5" +export AWS_SESSION_TOKEN="$6" +export AWS_DEFAULT_REGION="$7" +readonly password="$8" readonly now=$(date "+%Y-%m-%dT%H:%M:%S") readonly app_data_dir="${DATA_DIR}/${app_id}"