diff --git a/app.js b/app.js index 6665b1b..3d797e8 100644 --- a/app.js +++ b/app.js @@ -1,14 +1,4 @@ const pages = require('./pages/pages') -const Language = require("@shypes/language-translator"); -const globalVariables = require('./lib/globalVars'); - -async function main() { - lang = await pages.selectLanguage(); - globalVariables.language = lang.selection - await pages.connectWatch() -} - -main() - +pages.selectLanguage() diff --git a/buildRelease.sh b/buildRelease.sh index 820abd6..f9ab3e9 100644 --- a/buildRelease.sh +++ b/buildRelease.sh @@ -8,15 +8,18 @@ mv ./release/miwatchkleaner-macos-* ./release/MacOs && \ cp ./data/xiaomiPackageRemovalList.json ./release/Windows/data/ && \ cp ./data/xiaomiPackageRemovalList.json ./release/MacOS/data/ && \ cp ./data/xiaomiPackageRemovalList.json ./release/Linux/data/ && \ +cp -rf ./lang/ ./release/Windows/ && \ +cp -rf ./lang/ ./release/MacOS/ && \ +cp -rf ./lang/ ./release/Linux/ && \ chmod 0777 ./release/**/adb && \ chmod 0777 ./release/**/miwatchkleaner-* && \ chmod +x ./release/**/adb && \ chmod +x ./release/**/miwatchkleaner-* && \ cd release/MacOS/ && \ -tar -pcvzf miwatchkleaner.$buildNum-macos.tar.gz adb data/ my_apk/ miwatchkleaner-macos-x64 && \ +tar -pcvzf miwatchkleaner.$buildNum-macos.tar.gz adb data/ my_apk/ lang/ miwatchkleaner-macos-x64 && \ cd .. && \ cd Linux/ && \ -tar -pcvzf miwatchkleaner.$buildNum-Linux.tar.gz adb data/ my_apk/ miwatchkleaner-linux-x64 && \ +tar -pcvzf miwatchkleaner.$buildNum-Linux.tar.gz adb data/ my_apk/ lang/ miwatchkleaner-linux-x64 && \ cd .. && \ cd Windows/ && \ -zip -r miwatchkleaner.$buildNum-win.zip adb.exe AdbWinApi.dll AdbWinUsbApi.dll data/ my_apk/ miwatchkleaner-win-x86.exe \ No newline at end of file +zip -r miwatchkleaner.$buildNum-win.zip adb.exe AdbWinApi.dll AdbWinUsbApi.dll data/ my_apk/ lang/ miwatchkleaner-win-x86.exe \ No newline at end of file diff --git a/lib/inquirer.js b/lib/inquirer.js index 270226f..b776c29 100644 --- a/lib/inquirer.js +++ b/lib/inquirer.js @@ -20,6 +20,7 @@ module.exports = { await Language.get('main-menu-item-6'), await Language.get('main-menu-item-7'), await Language.get('main-menu-item-8'), + await Language.get('main-menu-item-9'), ], filter: function (val) { return val.toLowerCase(); @@ -112,7 +113,7 @@ module.exports = { },]; return inquirer.prompt(questions); }, - restoreAnyApp: async () => { + removeAnyApp: async () => { Language.setActiveLang(globalVariables.language) const questions = [{ type: "input", diff --git a/pages/pages.js b/pages/pages.js index 74d39e9..9850710 100644 --- a/pages/pages.js +++ b/pages/pages.js @@ -4,6 +4,7 @@ const inquirer = require('../lib/inquirer'); const files = require('../lib/files') const logger = require('perfect-logger'); const Language = require("@shypes/language-translator"); +const globalVariables = require('../lib/globalVars'); const adb = require('../lib/adb'); logger.info(process.platform + " detected") @@ -129,7 +130,7 @@ module.exports = { removeAnyApp: async () => { common.header('main-menu-item-6') common.log('main-menu-item-6') - const value = await inquirer.restoreAnyApp(); + const value = await inquirer.removeAnyApp(); await adb.restoreAnyApk(value) common.dualLog('removing-apps-complete', 'green') await common.pause(2000) @@ -187,7 +188,8 @@ module.exports = { common.header('Select Language') common.log('Select Language') const v = await inquirer.LanguageSelect() - return v + globalVariables.language = v.selection + module.exports.connectWatch() }, mainMenu: async () => { @@ -202,7 +204,6 @@ module.exports = { menu_7 = await Language.get('main-menu-item-7') menu_8 = await Language.get('main-menu-item-8') menu_9 = await Language.get('main-menu-item-9') - menu_10 = await Language.get('main-menu-item-10') switch (mainMenuSelection.mainMenu) { case menu_1.toLowerCase(): @@ -230,9 +231,6 @@ module.exports = { module.exports.batchRemoveInstalledApps() break; case menu_9.toLowerCase(): - module.exports.connectWatch() - break; - case menu_10.toLowerCase(): break; default: // code block