From 6abd48d4808a882a518cce84a4e9b6bfdf77f5ed Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Thu, 15 Nov 2018 11:21:21 -0800
Subject: [PATCH] rename backuptask to backupupload

---
 setup/start/sudoers                    | 4 ++--
 src/backups.js                         | 4 ++--
 src/{backuptask.js => backupupload.js} | 2 +-
 src/test/checkInstall                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{backuptask.js => backupupload.js} (96%)

diff --git a/setup/start/sudoers b/setup/start/sudoers
index d8b6c9a50..3f251747d 100644
--- a/setup/start/sudoers
+++ b/setup/start/sudoers
@@ -31,8 +31,8 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/authorized_keys
 Defaults!/home/yellowtent/box/src/scripts/configurelogrotate.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/configurelogrotate.sh
 
-Defaults!/home/yellowtent/box/src/backuptask.js env_keep="HOME BOX_ENV"
-yellowtent ALL=(root) NOPASSWD:SETENV: /home/yellowtent/box/src/backuptask.js
+Defaults!/home/yellowtent/box/src/backupupload.js env_keep="HOME BOX_ENV"
+yellowtent ALL=(root) NOPASSWD:SETENV: /home/yellowtent/box/src/backupupload.js
 
 Defaults!/home/yellowtent/box/src/scripts/restart.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/restart.sh
diff --git a/src/backups.js b/src/backups.js
index 9dadd5b14..7675d4099 100644
--- a/src/backups.js
+++ b/src/backups.js
@@ -66,7 +66,7 @@ var addons = require('./addons.js'),
 
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
-var BACKUPTASK_CMD = path.join(__dirname, 'backuptask.js');
+var BACKUP_UPLOAD_CMD = path.join(__dirname, 'backupupload.js');
 
 function debugApp(app) {
     assert(typeof app === 'object');
@@ -610,7 +610,7 @@ function runBackupTask(backupId, format, dataDir, callback) {
     var killTimerId = null, progressTimerId = null;
 
     var logStream = fs.createWriteStream(paths.BACKUP_LOG_FILE, { flags: 'a' });
-    var cp = shell.sudo(`backup-${backupId}`, [ BACKUPTASK_CMD, backupId, format, dataDir ], { env: process.env, logStream: logStream }, function (error) {
+    var cp = shell.sudo(`backup-${backupId}`, [ BACKUP_UPLOAD_CMD, backupId, format, dataDir ], { env: process.env, logStream: logStream }, function (error) {
         clearTimeout(killTimerId);
         clearInterval(progressTimerId);
 
diff --git a/src/backuptask.js b/src/backupupload.js
similarity index 96%
rename from src/backuptask.js
rename to src/backupupload.js
index e14202cb6..937f04f06 100755
--- a/src/backuptask.js
+++ b/src/backupupload.js
@@ -17,7 +17,7 @@ require('debug').formatArgs = function formatArgs(args) {
 var assert = require('assert'),
     backups = require('./backups.js'),
     database = require('./database.js'),
-    debug = require('debug')('box:backuptask'),
+    debug = require('debug')('box:backupupload'),
     paths = require('./paths.js'),
     safe = require('safetydance');
 
diff --git a/src/test/checkInstall b/src/test/checkInstall
index 0b0a47e3b..2f85b25b9 100755
--- a/src/test/checkInstall
+++ b/src/test/checkInstall
@@ -17,7 +17,7 @@ scripts=("${SOURCE_DIR}/src/scripts/rmvolume.sh" \
          "${SOURCE_DIR}/src/scripts/collectlogs.sh" \
          "${SOURCE_DIR}/src/scripts/configurecollectd.sh" \
          "${SOURCE_DIR}/src/scripts/authorized_keys.sh" \
-         "${SOURCE_DIR}/src/backuptask.js" \
+         "${SOURCE_DIR}/src/backupupload.js" \
          "${SOURCE_DIR}/src/scripts/configurelogrotate.sh")
 
 for script in "${scripts[@]}"; do