aaden-cli 1.6.56 → 1.6.58

package/AadenDeploy/Utils/fixCronJob.sh

@@ -26,10 +26,10 @@ echo "END Aaden Deploy CONFIG"
 echo "Innerken322." | sudo -S rm -rf /etc/cron.d/aaden-cli-upgrade
 echo "Innerken322." | sudo -S touch conf
 echo "Innerken322." | sudo -S chmod 777 conf
-echo "59 4 * * * sudo npm install aaden-cli -g" >>conf
+echo "55 4 * * * sudo npm install aaden-cli -g" >>conf
 echo "59 4 * * * /usr/local/bin/aaden-cli auto-upgrade" >>conf
 echo "@reboot sleep 30 && sudo npm install aaden-cli -g" >>conf
-echo "@reboot sleep 30 &&/usr/local/bin/aaden-cli auto-upgrade" >>conf
+echo "@reboot sleep 60 &&/usr/local/bin/aaden-cli auto-upgrade" >>conf
 echo "Innerken322." | sudo -S crontab -u root -r
 echo "Innerken322." | sudo -S crontab -u root conf
 echo "Innerken322." | sudo -S rm -f conf

package/AadenDeploy/upgrade.sh

@@ -2,9 +2,10 @@
 
 
 
-echo "Innerken322." | sudo -S mkdir -p /etc/aaden/config
-echo "Innerken322." | sudo -S chmod -R 777 /etc/aaden/config
-echo "Innerken322." | sudo -S npm update aaden-cli -g
+mkdir -p /etc/aaden/config
+chmod -R 777 /etc/aaden/config
+npm update aaden-cli -g
 
 aaden-cli patch
 
+

package/dist/index.js

@@ -18449,7 +18449,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.56"};
+module.exports = {"i8":"1.6.58"};
 
 /***/ })
 
@@ -18663,8 +18663,8 @@ function enterDatabase() {
     cli.executeInShell(command, program.debug)
 }
 
-function fixNgrok() {
-    run('AadenDeploy/Utils/enableNgrok.sh')
+async function fixNgrok() {
+    await run('AadenDeploy/Utils/enableNgrok.sh')
 }
 
 function testPrinter() {
@@ -19016,6 +19016,9 @@ function getMyDeviceId() {
 }
 
 async function autoUpgrade() {
+    if (!ngrokNewestVersion()) {
+        await fixNgrok()
+    }
     upgrade()
 }
 
@@ -19038,7 +19041,10 @@ function getStorageBackendFileVersion() {
         frontVersion = '0.0.0'
     }
     return frontVersion
+}
 
+function ngrokNewestVersion() {
+    return fs.existsSync('/etc/systemd/system/aaden-ngrok-v3.service');
 }
 
 function getBackendVersionOffline() {

package/index.js

@@ -140,8 +140,8 @@ function enterDatabase() {
     cli.executeInShell(command, program.debug)
 }
 
-function fixNgrok() {
-    run('AadenDeploy/Utils/enableNgrok.sh')
+async function fixNgrok() {
+    await run('AadenDeploy/Utils/enableNgrok.sh')
 }
 
 function testPrinter() {
@@ -493,6 +493,9 @@ function getMyDeviceId() {
 }
 
 async function autoUpgrade() {
+    if (!ngrokNewestVersion()) {
+        await fixNgrok()
+    }
     upgrade()
 }
 
@@ -515,7 +518,10 @@ function getStorageBackendFileVersion() {
         frontVersion = '0.0.0'
     }
     return frontVersion
+}
 
+function ngrokNewestVersion() {
+    return fs.existsSync('/etc/systemd/system/aaden-ngrok-v3.service');
 }
 
 function getBackendVersionOffline() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.6.56",
+  "version": "1.6.58",
   "description": "",
   "main": "dist/index.js",
   "scripts": {