From 7ae069528dc0eac2e7aedc6c41484e82bd2f4fda Mon Sep 17 00:00:00 2001 From: Jelle Siderius Date: Mon, 23 May 2022 08:38:16 +0200 Subject: [PATCH] Release 0.1.5 --- dist/controllers/mainController.js | 4 ---- dist/controllers/mainController.js.map | 2 +- dist/controllers/startController.js | 9 --------- dist/controllers/startController.js.map | 2 +- dist/models/databasesModel.js | 3 --- dist/models/databasesModel.js.map | 2 +- dist/questions/configurationQuestions.js | 2 -- dist/questions/configurationQuestions.js.map | 2 +- dist/tasks/checksTask.js | 2 +- dist/tasks/checksTask.js.map | 2 +- dist/tasks/importTask.js | 7 +++++++ dist/tasks/importTask.js.map | 2 +- package-lock.json | 2 +- package.json | 2 +- src/controllers/mainController.ts | 4 ---- src/controllers/startController.ts | 10 ---------- src/models/databasesModel.ts | 3 --- src/questions/configurationQuestions.ts | 3 --- src/tasks/checksTask.ts | 3 +-- src/tasks/importTask.ts | 11 ++++++++++- 20 files changed, 27 insertions(+), 50 deletions(-) diff --git a/dist/controllers/mainController.js b/dist/controllers/mainController.js index a38099a..fcd8c5c 100644 --- a/dist/controllers/mainController.js +++ b/dist/controllers/mainController.js @@ -34,10 +34,7 @@ class MainController { 'rsyncInstalled': false, 'elasticSearchUsed': false, 'import': 'no', - 'wordpressImport': 'no', - 'wordpressDownload': 'no', 'currentFolderIsShopware': false, - 'currentFolderhasWordpress': false }, 'localhost': { 'username': '', @@ -50,7 +47,6 @@ class MainController { }, 'finalMessages': { 'shopwareDatabaseLocation': '', - 'wordpressDatabaseLocation': '', 'importDomain': '' }, 'databases': { diff --git a/dist/controllers/mainController.js.map b/dist/controllers/mainController.js.map index 40f94ad..a20a68e 100644 --- a/dist/controllers/mainController.js.map +++ b/dist/controllers/mainController.js.map @@ -1 +1 @@ -{"version":3,"file":"mainController.js","sourceRoot":"","sources":["../../src/controllers/mainController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mainController.js","sourceRoot":"","sources":["../../src/controllers/mainController.ts"],"names":[],"mappings":";;;AAAA,aAAa;AACb,uFAAmD;AACnD,uCAAgC;AAChC,sFAAsD;AACtD,+CAAwB;AACxB,mDAA4B;AAC5B,mCAA+B;AAC/B,4EAA2C;AAC3C,gEAA+B;AAC/B,kBAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC,yCAAyC,CAAC,CAAC,CAAC;AAG3F,MAAM,cAAc;IAkDhB;QAjDO,WAAM,GAAG;YACZ,cAAc,EAAE;gBACZ,gBAAgB,EAAE,uBAAU,CAAC,GAAG,CAAC,WAAW;gBAC5C,eAAe,EAAE,uBAAU,CAAC,GAAG,CAAC,UAAU;gBAC1C,6BAA6B,EAAE,uBAAU,CAAC,OAAO,CAAC,gBAAgB;aACrE;YACD,iBAAiB,EAAE;gBACf,iBAAiB,EAAE,EAAE;gBACrB,cAAc,EAAE,EAAE;gBAClB,cAAc,EAAE,EAAE;aACrB;YACD,UAAU,EAAE;gBACR,eAAe,EAAE,EAAE;gBACnB,mBAAmB,EAAE,EAAE;gBACvB,kBAAkB,EAAE,EAAE;gBACtB,kBAAkB,EAAE,EAAE;gBACtB,OAAO,EAAE,EAAE;gBACX,YAAY,EAAE,KAAK;gBACnB,gBAAgB,EAAE,KAAK;gBACvB,mBAAmB,EAAE,KAAK;gBAC1B,QAAQ,EAAE,IAAI;gBACd,yBAAyB,EAAE,KAAK;aACnC;YACD,WAAW,EAAE;gBACT,UAAU,EAAE,EAAE;gBACd,UAAU,EAAE,EAAE;gBACd,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,EAAE;gBACV,UAAU,EAAE,EAAE;gBACd,WAAW,EAAE,EAAE;gBACf,OAAO,EAAE,KAAK;aACjB;YACD,eAAe,EAAE;gBACb,0BAA0B,EAAE,EAAE;gBAC9B,cAAc,EAAE,EAAE;aACrB;YACD,WAAW,EAAE;gBACT,eAAe,EAAE,IAAI;gBACrB,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;aACvB;SACJ,CAAC;QACK,SAAI,GAAG,IAAI,cAAK,CACnB,EAAE,EACF,EAAC,UAAU,EAAE,KAAK,EAAC,CACtB,CAAC;QACK,QAAG,GAAG,IAAI,kBAAO,EAAE,CAAC;QACpB,cAAS,GAAG,IAAI,wBAAc,EAAE,CAAC;QAMxC,oBAAe,GAAG,GAAS,EAAE;YACzB,4CAA4C;YAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,EAAE;gBAC1C,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,GAAG,cAAc,CAAC;aACpF;YAED,sCAAsC;YACtC,MAAM,wBAAa,CAAC,OAAO,CAAC;iBAC3B,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC;YAC/C,CAAC,CAAC,CAAC,KAAK,CAAC,cAAW,CAAC,CAAC,CAAC;YAEvB,8BAA8B;YAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YAEnD,kDAAkD;YAClD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;QAC7G,CAAC,CAAA,CAAA;QApBG,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;CAoBJ;AAED,kBAAe,cAAc,CAAA"} \ No newline at end of file diff --git a/dist/controllers/startController.js b/dist/controllers/startController.js index 5d07666..6ec1fba 100644 --- a/dist/controllers/startController.js +++ b/dist/controllers/startController.js @@ -30,15 +30,6 @@ class StartController extends mainController_1.default { } else if (this.config.finalMessages.shopwareDatabaseLocation.length > 0) { console_1.success(`Downloaded Shopware database to: ${this.config.finalMessages.shopwareDatabaseLocation}`); - // Show wordpress download message if downloaded - if (this.config.finalMessages.wordpressDatabaseLocation.length > 0 && this.config.settings.wordpressDownload && this.config.settings.wordpressDownload == 'yes' && this.config.settings.wordpressImport != 'yes') { - console_1.success(`Downloaded Wordpress database to: ${this.config.finalMessages.wordpressDatabaseLocation}`); - } - } - // Show wordpress import message if imported - if (this.config.settings.wordpressImport && this.config.settings.wordpressImport == 'yes') { - console_1.success(`Wordpress is successfully imported to localhost.`); - console_1.info(`You can log in to the Wordpress backend with username: ${settings_json_1.default.shopwareBackend.adminEmailAddress} and password: ${settings_json_1.default.shopwareBackend.adminPassword}`); } process.exit(); } diff --git a/dist/controllers/startController.js.map b/dist/controllers/startController.js.map index 8135e3f..931343f 100644 --- a/dist/controllers/startController.js.map +++ b/dist/controllers/startController.js.map @@ -1 +1 @@ -{"version":3,"file":"startController.js","sourceRoot":"","sources":["../../src/controllers/startController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"startController.js","sourceRoot":"","sources":["../../src/controllers/startController.ts"],"names":[],"mappings":";;;AAAA,8CAA+D;AAC/D,aAAa;AACb,uFAAmD;AACnD,8EAA8C;AAC9C,qGAAqE;AACrE,yGAAyE;AACzE,yGAAyE;AACzE,6EAA6C;AAC7C,iFAAiD;AACjD,6EAA6C;AAC7C,mGAAmE;AAEnE,MAAM,eAAgB,SAAQ,wBAAc;IAA5C;;QACI,iBAAY,GAAG,GAAwB,EAAE;YACrC,oCAAoC;YACpC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAE1B,sBAAsB;YACtB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAE1B,gBAAgB;YAChB,IAAI;gBACA,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBAEtB,8CAA8C;gBAC9C,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;oBACnD,iBAAO,CAAC,mDAAmD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,oBAAoB,CAAC,CAAC;oBACvH,cAAI,CAAC,yDAAyD,uBAAU,CAAC,eAAe,CAAC,aAAa,kBAAkB,uBAAU,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC;iBACvK;qBAAM,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,wBAAwB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtE,iBAAO,CAAC,oCAAoC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,wBAAwB,EAAE,CAAC,CAAC;iBACrG;gBAED,OAAO,CAAC,IAAI,EAAE,CAAC;aAClB;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACnB;QACL,CAAC,CAAA,CAAA;QAED,wBAAwB;QACxB,iBAAY,GAAG,GAAS,EAAE;YACtB,oBAAoB;YACpB,sBAAY,EAAE,CAAC;YAEf,mCAAmC;YACnC,IAAI,oBAAoB,GAAG,MAAM,IAAI,8BAAoB,EAAE,CAAC;YAC5D,MAAM,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAElD,4CAA4C;YAC5C,IAAI,sBAAsB,GAAG,MAAM,IAAI,gCAAsB,EAAE,CAAC;YAChE,MAAM,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEpD,wCAAwC;YACxC,IAAI,sBAAsB,GAAG,MAAM,IAAI,gCAAsB,EAAE,CAAC;YAChE,MAAM,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEpD,oBAAoB;YACpB,sBAAY,EAAE,CAAC;QACnB,CAAC,CAAA,CAAA;QAED,sBAAsB;QACtB,iBAAY,GAAG,GAAS,EAAE;YACtB,sBAAsB;YACtB,IAAI,SAAS,GAAG,MAAM,IAAI,oBAAU,EAAE,CAAC;YACvC,MAAM,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAElD,yBAAyB;YACzB,IAAI,YAAY,GAAG,MAAM,IAAI,sBAAY,EAAE,CAAC;YAC5C,MAAM,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAE/D,8BAA8B;YAC9B,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,KAAK,EAAE;gBACrE,oBAAoB;gBACpB,IAAI,UAAU,GAAG,MAAM,IAAI,oBAAU,EAAE,CAAC;gBACxC,MAAM,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBAEnD,gCAAgC;gBAChC,IAAI,qBAAqB,GAAG,MAAM,IAAI,+BAAqB,EAAE,CAAC;gBAC9D,MAAM,qBAAqB,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aACjE;QACL,CAAC,CAAA,CAAA;IACL,CAAC;CAAA;AAED,kBAAe,eAAe,CAAA"} \ No newline at end of file diff --git a/dist/models/databasesModel.js b/dist/models/databasesModel.js index 0e5be5d..98b1067 100644 --- a/dist/models/databasesModel.js +++ b/dist/models/databasesModel.js @@ -16,7 +16,6 @@ class DatabasesModel { 'port': 22, 'localProjectFolder': '', 'externalProjectFolder': '', - 'wordpress': false, 'externalPhpPath': '', }; // Collect databases | collect single database @@ -39,8 +38,6 @@ class DatabasesModel { this.databaseData.port = database.port; this.databaseData.externalProjectFolder = database.externalProjectFolder; // @ts-ignore - this.databaseData.wordpress = database.wordpress; - // @ts-ignore this.databaseData.externalPhpPath = database.externalPhpPath; } else { diff --git a/dist/models/databasesModel.js.map b/dist/models/databasesModel.js.map index 8d9717d..4ad1be9 100644 --- a/dist/models/databasesModel.js.map +++ b/dist/models/databasesModel.js.map @@ -1 +1 @@ -{"version":3,"file":"databasesModel.js","sourceRoot":"","sources":["../../src/models/databasesModel.ts"],"names":[],"mappings":";;;AAAA,aAAa;AACb,+FAAmE;AACnE,aAAa;AACb,qGAAyE;AAEzE,MAAM,cAAc;IAApB;QACQ,kBAAa,GAAyB,EAAE,CAAC;QACzC,iBAAY,GAAG;YACrB,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE,EAAE;YACZ,cAAc,EAAE,EAAE;YAClB,MAAM,EAAE,EAAE;YACV,oBAAoB,EAAE,EAAE;YACxB,uBAAuB,EAAE,EAAE;YAC3B,WAAW,EAAE,KAAK;YAClB,iBAAiB,EAAE,EAAE;SACrB,CAAC;QAEF,8CAA8C;QAC9C,wBAAmB,GAAG,CAAO,WAA0B,EAAE,YAA2B,EAAG,EAAE;YACxF,aAAa;YACb,IAAI,SAAS,GAAG,sBAAgB,CAAC,SAAS,CAAC;YAE3C,IAAI,YAAY,IAAI,YAAY,EAAE;gBACjC,aAAa;gBACb,SAAS,GAAG,yBAAmB,CAAC,SAAS,CAAC;aAC1C;YAED,KAAK,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBACtD,IAAI,WAAW,IAAI,GAAG,EAAE;oBACvB,+BAA+B;oBAC/B,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;oBAC/C,aAAa;oBACb,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;oBAC/C,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;oBAC3C,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;oBACvD,aAAa;oBACb,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;oBACvC,IAAI,CAAC,YAAY,CAAC,qBAAqB,GAAG,QAAQ,CAAC,qBAAqB,CAAC;oBACzE,aAAa;oBACb,IAAI,CAAC,YAAY,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;oBACjD,aAAa;oBACb,IAAI,CAAC,YAAY,CAAC,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAA;iBAC5D;qBAAM;oBACN,uBAAuB;oBACvB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,YAAY,MAAM,QAAQ,CAAC,QAAQ,KAAK,GAAG,GAAG,CAAC,CAAC;iBACpF;aACD;QACF,CAAC,CAAA,CAAA;IACF,CAAC;CAAA;AAED,kBAAe,cAAc,CAAC"} \ No newline at end of file +{"version":3,"file":"databasesModel.js","sourceRoot":"","sources":["../../src/models/databasesModel.ts"],"names":[],"mappings":";;;AAAA,aAAa;AACb,+FAAmE;AACnE,aAAa;AACb,qGAAyE;AAEzE,MAAM,cAAc;IAApB;QACQ,kBAAa,GAAyB,EAAE,CAAC;QACzC,iBAAY,GAAG;YACrB,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE,EAAE;YACZ,cAAc,EAAE,EAAE;YAClB,MAAM,EAAE,EAAE;YACV,oBAAoB,EAAE,EAAE;YACxB,uBAAuB,EAAE,EAAE;YAC3B,iBAAiB,EAAE,EAAE;SACrB,CAAC;QAEF,8CAA8C;QAC9C,wBAAmB,GAAG,CAAO,WAA0B,EAAE,YAA2B,EAAG,EAAE;YACxF,aAAa;YACb,IAAI,SAAS,GAAG,sBAAgB,CAAC,SAAS,CAAC;YAE3C,IAAI,YAAY,IAAI,YAAY,EAAE;gBACjC,aAAa;gBACb,SAAS,GAAG,yBAAmB,CAAC,SAAS,CAAC;aAC1C;YAED,KAAK,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBACtD,IAAI,WAAW,IAAI,GAAG,EAAE;oBACvB,+BAA+B;oBAC/B,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;oBAC/C,aAAa;oBACb,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;oBAC/C,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;oBAC3C,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;oBACvD,aAAa;oBACb,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;oBACvC,IAAI,CAAC,YAAY,CAAC,qBAAqB,GAAG,QAAQ,CAAC,qBAAqB,CAAC;oBACzE,aAAa;oBACb,IAAI,CAAC,YAAY,CAAC,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAA;iBAC5D;qBAAM;oBACN,uBAAuB;oBACvB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,YAAY,MAAM,QAAQ,CAAC,QAAQ,KAAK,GAAG,GAAG,CAAC,CAAC;iBACpF;aACD;QACF,CAAC,CAAA,CAAA;IACF,CAAC;CAAA;AAED,kBAAe,cAAc,CAAC"} \ No newline at end of file diff --git a/dist/questions/configurationQuestions.js b/dist/questions/configurationQuestions.js index f9eb51e..91a1b64 100644 --- a/dist/questions/configurationQuestions.js +++ b/dist/questions/configurationQuestions.js @@ -17,8 +17,6 @@ class ConfigurationQuestions { config.settings.strip = answers.strip; // Set import setting for Shopware config.settings.import = answers.import; - // Set wordpress download value - config.settings.wordpressDownload = answers.wordpressDownload; // Change location of database download depending on answer if (config.settings.import == 'yes') { config.customConfig.localDatabaseFolderLocation = config.settings.currentFolder; diff --git a/dist/questions/configurationQuestions.js.map b/dist/questions/configurationQuestions.js.map index 967dd3b..8a7d68b 100644 --- a/dist/questions/configurationQuestions.js.map +++ b/dist/questions/configurationQuestions.js.map @@ -1 +1 @@ -{"version":3,"file":"configurationQuestions.js","sourceRoot":"","sources":["../../src/questions/configurationQuestions.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAChC,gEAA+B;AAE/B,MAAM,sBAAsB;IAA5B;QACY,iBAAY,GAAG,EAAE,CAAC;QAClB,iBAAY,GAAG,EAAE,CAAC;QAE1B,cAAS,GAAG,CAAO,MAAW,EAAE,EAAE;YAC9B,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAEhC,qBAAqB;YACrB,MAAM,kBAAQ;iBACT,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;iBACzB,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBACd,uBAAuB;gBACvB,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;gBAEtC,kCAAkC;gBAClC,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;gBAEvC,+BAA+B;gBAC/B,MAAM,CAAC,QAAQ,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAA;gBAE7D,2DAA2D;gBAC3D,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,KAAK,EAAE;oBACjC,MAAM,CAAC,YAAY,CAAC,2BAA2B,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;iBACnF;YACL,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAsB,EAAE,EAAE;gBAC9B,eAAK,CAAC,yBAAyB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;YACjD,CAAC,CAAC,CAAC;QACX,CAAC,CAAA,CAAA;QAED,gBAAgB;QAChB,iBAAY,GAAG,CAAO,MAAW,EAAE,EAAE;YACjC,IAAI,CAAC,YAAY,CAAC,IAAI,CAClB;gBACI,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE,iEAAiE;gBAC1E,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC;gBAC7B,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;oBACxB,OAAO,KAAK,KAAK,EAAE,CAAA;gBACvB,CAAC;aACJ,CACJ,CAAC;YAEF,mDAAmD;YACnD,IAAI,MAAM,CAAC,QAAQ,CAAC,uBAAuB,EAAE;gBACzC,IAAI,CAAC,YAAY,CAAC,IAAI,CAClB;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,2BAA2B;oBACpC,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;oBACtB,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;wBACxB,OAAO,KAAK,CAAC;oBACjB,CAAC;iBACJ,CACJ,CAAC;aACL;QACL,CAAC,CAAA,CAAA;IACL,CAAC;CAAA;AAED,kBAAe,sBAAsB,CAAA"} \ No newline at end of file +{"version":3,"file":"configurationQuestions.js","sourceRoot":"","sources":["../../src/questions/configurationQuestions.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAChC,gEAA+B;AAE/B,MAAM,sBAAsB;IAA5B;QACY,iBAAY,GAAG,EAAE,CAAC;QAClB,iBAAY,GAAG,EAAE,CAAC;QAE1B,cAAS,GAAG,CAAO,MAAW,EAAE,EAAE;YAC9B,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAEhC,qBAAqB;YACrB,MAAM,kBAAQ;iBACT,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;iBACzB,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBACd,uBAAuB;gBACvB,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;gBAEtC,kCAAkC;gBAClC,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;gBAEvC,2DAA2D;gBAC3D,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,KAAK,EAAE;oBACjC,MAAM,CAAC,YAAY,CAAC,2BAA2B,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;iBACnF;YACL,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAsB,EAAE,EAAE;gBAC9B,eAAK,CAAC,yBAAyB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;YACjD,CAAC,CAAC,CAAC;QACX,CAAC,CAAA,CAAA;QAED,gBAAgB;QAChB,iBAAY,GAAG,CAAO,MAAW,EAAE,EAAE;YACjC,IAAI,CAAC,YAAY,CAAC,IAAI,CAClB;gBACI,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE,iEAAiE;gBAC1E,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC;gBAC7B,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;oBACxB,OAAO,KAAK,KAAK,EAAE,CAAA;gBACvB,CAAC;aACJ,CACJ,CAAC;YAEF,mDAAmD;YACnD,IAAI,MAAM,CAAC,QAAQ,CAAC,uBAAuB,EAAE;gBACzC,IAAI,CAAC,YAAY,CAAC,IAAI,CAClB;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,2BAA2B;oBACpC,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;oBACtB,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;wBACxB,OAAO,KAAK,CAAC;oBACjB,CAAC;iBACJ,CACJ,CAAC;aACL;QACL,CAAC,CAAA,CAAA;IACL,CAAC;CAAA;AAED,kBAAe,sBAAsB,CAAA"} \ No newline at end of file diff --git a/dist/tasks/checksTask.js b/dist/tasks/checksTask.js index 5eb1b25..732558f 100644 --- a/dist/tasks/checksTask.js +++ b/dist/tasks/checksTask.js @@ -16,7 +16,7 @@ class ChecksTask { title: 'Running some checks', task: (ctx, task) => task.newListr(this.checkTasks) }); - if (config.settings.import && config.settings.import == 'yes' || config.settings.wordpressImport && config.settings.wordpressImport == "yes" && config.settings.currentFolderhasWordpress) { + if (config.settings.import && config.settings.import == 'yes') { // Check if all settings are filled in, if we import this.checkTasks.push({ title: 'Checking if config/settings.json is correctly filled', diff --git a/dist/tasks/checksTask.js.map b/dist/tasks/checksTask.js.map index 1962931..99e83d2 100644 --- a/dist/tasks/checksTask.js.map +++ b/dist/tasks/checksTask.js.map @@ -1 +1 @@ -{"version":3,"file":"checksTask.js","sourceRoot":"","sources":["../../src/tasks/checksTask.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"checksTask.js","sourceRoot":"","sources":["../../src/tasks/checksTask.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/tasks/importTask.js b/dist/tasks/importTask.js index 7dd7bc7..ce98d69 100644 --- a/dist/tasks/importTask.js +++ b/dist/tasks/importTask.js @@ -51,6 +51,13 @@ class ImportTask { yield console_1.localhostShopwareRootExec(`mysql -u ${config.localhost.username} --password=${config.localhost.password} ${config.localhost.database} --force < ${config.settings.databaseFullPath}/${config.settings.databaseFileName}.sql`, config, true); }) }); + this.importTasks.push({ + title: 'Cleaning up', + task: () => tslib_1.__awaiter(this, void 0, void 0, function* () { + // Remove local SQL file + yield console_1.localhostShopwareRootExec(`rm ${config.settings.databaseFileName}.sql`, config); + }) + }); }); } } diff --git a/dist/tasks/importTask.js.map b/dist/tasks/importTask.js.map index 49ca78e..04465a7 100644 --- a/dist/tasks/importTask.js.map +++ b/dist/tasks/importTask.js.map @@ -1 +1 @@ -{"version":3,"file":"importTask.js","sourceRoot":"","sources":["../../src/tasks/importTask.ts"],"names":[],"mappings":";;;AAAA,8CAAmF;AAInF,MAAM,UAAU;IAAhB;QACY,gBAAW,GAAG,EAAE,CAAC;QAEzB,cAAS,GAAG,CAAO,IAAS,EAAE,MAAW,EAAE,EAAE;YACzC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC;QAChB,CAAC,CAAA,CAAA;QAED,YAAY;QACZ,aAAQ,GAAG,CAAO,IAAS,EAAE,MAAW,EAAE,EAAE;YACxC,IAAI,CAAC,GAAG,CACJ;gBACI,KAAK,EAAE,uCAAuC;gBAC9C,IAAI,EAAE,CAAC,GAAQ,EAAE,IAAS,EAAS,EAAE,CACrC,IAAI,CAAC,QAAQ,CACT,IAAI,CAAC,WAAW,CACnB;aACJ,CACJ,CAAA;YAED,IAAI,CAAC,WAAW,CAAC,IAAI,CACjB;gBACI,KAAK,EAAE,6BAA6B;gBACpC,IAAI,EAAE,GAAwB,EAAE;oBAC5B,MAAM,mCAAyB,CAAC,iCAAiC,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE;wBAC5F,IAAI,MAAM,EAAE;4BACR,IAAI,eAAe,GAAG,gCAAsB,CAAC,MAAM,CAAC,CAAC;4BAErD,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;4BACrD,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;4BACrD,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;4BAC7C,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;4BAC7C,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;yBACxD;oBACL,CAAC,CAAC,CAAC;oBAEH,MAAM,mCAAyB,CAAC,4BAA4B,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE;wBACvF,IAAI,MAAM,EAAE;4BACR,IAAI,MAAM,GAAG,MAAM,EACf,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EACnC,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;4BAEhE,MAAM,CAAC,SAAS,CAAC,SAAS,GAAG,eAAe,CAAC;4BAE7C,0BAA0B;4BAC1B,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;gCAChC,MAAM,CAAC,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;6BACjC;yBACJ;oBACL,CAAC,CAAC,CAAC;gBACP,CAAC,CAAA;aACJ,CACJ,CAAC;YAEF,IAAI,CAAC,WAAW,CAAC,IAAI,CACjB;gBACI,KAAK,EAAE,iCAAiC;gBACxC,IAAI,EAAE,GAAwB,EAAE;oBAC5B,gBAAgB;oBAChB,MAAM,mCAAyB,CAAC,iBAAiB,MAAM,CAAC,SAAS,CAAC,QAAQ,eAAe,MAAM,CAAC,SAAS,CAAC,QAAQ,SAAS,MAAM,CAAC,SAAS,CAAC,QAAQ,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;oBAEzK,kBAAkB;oBAClB,MAAM,mCAAyB,CAAC,iBAAiB,MAAM,CAAC,SAAS,CAAC,QAAQ,eAAe,MAAM,CAAC,SAAS,CAAC,QAAQ,WAAW,MAAM,CAAC,SAAS,CAAC,QAAQ,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;oBAE3K,kBAAkB;oBAClB,MAAM,mCAAyB,CAAC,YAAY,MAAM,CAAC,SAAS,CAAC,QAAQ,eAAe,MAAM,CAAC,SAAS,CAAC,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,cAAc,MAAM,CAAC,QAAQ,CAAC,gBAAgB,IAAI,MAAM,CAAC,QAAQ,CAAC,gBAAgB,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;gBACtP,CAAC,CAAA;aACJ,CACJ,CAAC;QACN,CAAC,CAAA,CAAA;IACL,CAAC;CAAA;AAED,kBAAe,UAAU,CAAA"} \ No newline at end of file +{"version":3,"file":"importTask.js","sourceRoot":"","sources":["../../src/tasks/importTask.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 9392575..b02bcdc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "sw-db-sync", - "version": "0.1.4", + "version": "0.1.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d505368..4133a13 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sw-db-sync", - "version": "0.1.4", + "version": "0.1.5", "description": "Database synchronizer for Shopware 6", "author": { "name": "Jelle Siderius" diff --git a/src/controllers/mainController.ts b/src/controllers/mainController.ts index 943a6cd..b81c135 100644 --- a/src/controllers/mainController.ts +++ b/src/controllers/mainController.ts @@ -32,10 +32,7 @@ class MainController { 'rsyncInstalled': false, 'elasticSearchUsed': false, 'import': 'no', - 'wordpressImport': 'no', - 'wordpressDownload': 'no', 'currentFolderIsShopware': false, - 'currentFolderhasWordpress': false }, 'localhost': { 'username': '', @@ -48,7 +45,6 @@ class MainController { }, 'finalMessages': { 'shopwareDatabaseLocation': '', - 'wordpressDatabaseLocation': '', 'importDomain': '' }, 'databases': { diff --git a/src/controllers/startController.ts b/src/controllers/startController.ts index 8853305..4efb167 100644 --- a/src/controllers/startController.ts +++ b/src/controllers/startController.ts @@ -28,16 +28,6 @@ class StartController extends MainController { info(`You can log in to the Shopware backend with username: ${configFile.shopwareBackend.adminUsername} and password: ${configFile.shopwareBackend.adminPassword}`); } else if (this.config.finalMessages.shopwareDatabaseLocation.length > 0) { success(`Downloaded Shopware database to: ${this.config.finalMessages.shopwareDatabaseLocation}`); - // Show wordpress download message if downloaded - if (this.config.finalMessages.wordpressDatabaseLocation.length > 0 && this.config.settings.wordpressDownload && this.config.settings.wordpressDownload == 'yes' && this.config.settings.wordpressImport != 'yes') { - success(`Downloaded Wordpress database to: ${this.config.finalMessages.wordpressDatabaseLocation}`); - } - } - - // Show wordpress import message if imported - if (this.config.settings.wordpressImport && this.config.settings.wordpressImport == 'yes') { - success(`Wordpress is successfully imported to localhost.`); - info(`You can log in to the Wordpress backend with username: ${configFile.shopwareBackend.adminEmailAddress} and password: ${configFile.shopwareBackend.adminPassword}`); } process.exit(); diff --git a/src/models/databasesModel.ts b/src/models/databasesModel.ts index ddb915e..477faba 100644 --- a/src/models/databasesModel.ts +++ b/src/models/databasesModel.ts @@ -13,7 +13,6 @@ class DatabasesModel { 'port': 22, 'localProjectFolder': '', 'externalProjectFolder': '', - 'wordpress': false, 'externalPhpPath': '', }; @@ -39,8 +38,6 @@ class DatabasesModel { this.databaseData.port = database.port; this.databaseData.externalProjectFolder = database.externalProjectFolder; // @ts-ignore - this.databaseData.wordpress = database.wordpress; - // @ts-ignore this.databaseData.externalPhpPath = database.externalPhpPath } else { // Collect all database diff --git a/src/questions/configurationQuestions.ts b/src/questions/configurationQuestions.ts index be786dc..099e853 100644 --- a/src/questions/configurationQuestions.ts +++ b/src/questions/configurationQuestions.ts @@ -18,9 +18,6 @@ class ConfigurationQuestions { // Set import setting for Shopware config.settings.import = answers.import - // Set wordpress download value - config.settings.wordpressDownload = answers.wordpressDownload - // Change location of database download depending on answer if (config.settings.import == 'yes') { config.customConfig.localDatabaseFolderLocation = config.settings.currentFolder; diff --git a/src/tasks/checksTask.ts b/src/tasks/checksTask.ts index 94b09c3..efb54c9 100644 --- a/src/tasks/checksTask.ts +++ b/src/tasks/checksTask.ts @@ -1,6 +1,5 @@ import * as fs from 'fs' import { Listr } from 'listr2'; -import { consoleCommand } from '../utils/console'; import configFile from '../../config/settings.json' class ChecksTask { @@ -23,7 +22,7 @@ class ChecksTask { } ) - if (config.settings.import && config.settings.import == 'yes' || config.settings.wordpressImport && config.settings.wordpressImport == "yes" && config.settings.currentFolderhasWordpress) { + if (config.settings.import && config.settings.import == 'yes') { // Check if all settings are filled in, if we import this.checkTasks.push( { diff --git a/src/tasks/importTask.ts b/src/tasks/importTask.ts index 23ed9be..42c8b64 100644 --- a/src/tasks/importTask.ts +++ b/src/tasks/importTask.ts @@ -1,6 +1,5 @@ import {extractDatabaseDetails, localhostShopwareRootExec} from '../utils/console'; import { Listr } from 'listr2'; -import {sed} from 'shelljs' class ImportTask { private importTasks = []; @@ -71,6 +70,16 @@ class ImportTask { } } ); + + this.importTasks.push( + { + title: 'Cleaning up', + task: async (): Promise => { + // Remove local SQL file + await localhostShopwareRootExec(`rm ${config.settings.databaseFileName}.sql`, config); + } + } + ); } }