From 517e6737fb6bbe0ff484c67edd5d891eb221db05 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@forwardbias.in>
Date: Thu, 26 Mar 2015 18:51:34 -0700
Subject: [PATCH] Remove addons dep from cloudron.js

---
 src/apptask.js  |  8 +++++++-
 src/cloudron.js | 27 +++++++++------------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/apptask.js b/src/apptask.js
index 58c0693e2..a69c32a03 100644
--- a/src/apptask.js
+++ b/src/apptask.js
@@ -695,6 +695,9 @@ function restore(app, callback) {
         updateApp.bind(null, app, { installationProgress: 'Downloading image' }),
         downloadImage.bind(null, app),
 
+        updateApp.bind(null, app, { installationProgress: 'Restoring addons' }),
+        addons.restoreAddons.bind(null, app),
+
         // setup addons
         updateApp.bind(null, app, { installationProgress: 'Setting up addons' }),
         addons.updateAddons.bind(null, app, oldManifest),
@@ -802,7 +805,10 @@ function update(app, callback) {
         updateApp.bind(null, app, { installationProgress: 'Deleting container' }),
         deleteContainer.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: 'Backing up' }),
+        updateApp.bind(null, app, { installationProgress: 'Backing up addons' }),
+        addons.backupAddons.bind(null, app),
+
+        updateApp.bind(null, app, { installationProgress: 'Uploading backup' }),
         cloudron.backupApp.bind(null, app),
 
         updateApp.bind(null, app, { installationProgress: 'Verify manifest' }),
diff --git a/src/cloudron.js b/src/cloudron.js
index d911c5419..2bba24a95 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -21,8 +21,7 @@ exports = module.exports = {
     getIp: getIp
 };
 
-var addons = require('./addons.js'),
-    apps = require('./apps.js'),
+var apps = require('./apps.js'),
     assert = require('assert'),
     async = require('async'),
     config = require('../config.js'),
@@ -200,32 +199,24 @@ function restoreApp(app, callback) {
         execFile(SUDO, [ RESTORE_APP_CMD,  app.id, result.url, result.backupKey ], { }, function (error, stdout, stderr) {
             if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, 'Error backing up : ' + stderr));
 
-            addons.restoreAddons(app, function (error) {
-                if (error) return callback(error);
-
-                callback(null);
-            });
+            callback(null);
         });
     });
 }
 
 function backupApp(app, callback) {
-    addons.backupAddons(app, function (error) {
+    getBackupUrl(app.id, null, function (error, result) {
         if (error) return callback(error);
 
-        getBackupUrl(app.id, null, function (error, result) {
-            if (error) return callback(error);
+        debug('backupApp: %s (%s) app url:%s id:%s', app.id, app.manifest.title, result.url, result.id);
 
-            debug('backupApp: %s (%s) app url:%s id:%s', app.id, app.manifest.title, result.url, result.id);
+        execFile(SUDO, [ BACKUP_APP_CMD,  app.id, result.url, result.backupKey ], { }, function (error, stdout, stderr) {
+            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, 'Error backing up : ' + stderr));
 
-            execFile(SUDO, [ BACKUP_APP_CMD,  app.id, result.url, result.backupKey ], { }, function (error, stdout, stderr) {
-                if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, 'Error backing up : ' + stderr));
+            debug('backupApp: %s (%s) successful', app.id, app.manifest.title);
 
-                debug('backupApp: %s (%s) successful', app.id, app.manifest.title);
-
-                apps.setLastBackupId(app.id, result.id, callback.bind(null, null, result.id));
-            });
-        }); 
+            apps.setLastBackupId(app.id, result.id, callback.bind(null, null, result.id));
+        });
     });
 }