aaden-cli 1.1.121 → 1.1.125

package/AadenDeploy/update.sh

@@ -14,7 +14,7 @@ echo "Innerken322." | sudo -S chmod +x /var/www/html/crontab.sh
 echo "Innerken322." | sudo -S chmod +x /var/www/html/PHP/vendor/bin/phinx
 echo "Innerken322." | sudo -S chmod +x /var/www/html/PHP/vendor/robmorgan/phinx/bin/phinx
 
-echo "Innerken322." | sudo -S snap refresh aaden-vue-app --channel=edge
+echo "Innerken322." | sudo -S snap refresh aaden-vue-app
 
 # run migrations
 cd /var/www/html/PHP || exit

package/dist/index.js

@@ -57462,7 +57462,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.120"};
+module.exports = {"i8":"1.1.124"};
 
 /***/ }),
 
@@ -57719,11 +57719,11 @@ program.command('load-new-version').action(loadNewVersion) // auto execute.
 program.command('local-version').action(() => {
   console.log('storage:' + getStorageBackendFileVersion())
 })
-program.command('backup [upload]').action(backup)
+program.command('backup [noUpload]').action(backup)
 program.command('ngrok').action(startNgrokService)
 program.command('update-ngrok-config <deviceId>').action(updateNgrokConfig)
 program.command('get-database').action(getDatabase)
-program.command('get-newdatabase').action(getnewDatabase)
+program.command('get-newdatabase').action(getNewDatabase)
 program.command('run <filePath>').action(run)
 program.command('patch').action(patch)
 program.command('check-tse').action(checkTse)
@@ -57734,6 +57734,7 @@ program.command('full-update').action(fullUpdate)
 program.command('return-terminal').action(returnTerminal)
 program.command('db').action(enterDatabase)
 program.command('printer-test').action(testPrinter)
+program.command('log').action(log)
 program.command('enable-mile-pay').action(enableMilePay)
 program.command('start-mile-pay').action(startService)
 program.command('mile-pay-option')
@@ -57801,9 +57802,13 @@ async function selectOption () {
   }
 }
 
+function log(){
+  cli.executeInShell(['tail -f /var/www/html/Resource/failLog.log'])
+}
+
 function enterDatabase () {
   const command = [
-    `mysql -uaaden -p -Daaden`
+    `mysql -uaaden -pInnerken322. -Daaden`
   ]
   cli.executeInShell(command, program.debug)
 }
@@ -57823,7 +57828,7 @@ function getDatabase () {
   cli.executeInShell(command, program.debug)
 }
 
-function getnewDatabase () {
+function getNewDatabase () {
   const command = [
     `mysqldump -uaaden -pInnerken322. --databases aaden --tables Attribute AttributeGroup BonTemplate Category_AttributeGroup DishWithName Dish_AttributeGroup Dishes DishesString DishesCategory DishesCategoryString DishesCategoryType DishesCategoryTypeString ConsumeType_Dishes_Free ConsumeType_Dishes_Show> transfer.sql`,
     'sudo cp transfer.sql /var/www/html'
@@ -57949,7 +57954,7 @@ async function startNgrokService () {
   cli.executeInShell(command, program.debug)
 }
 
-async function backup (upload = false) {
+async function backup (noUpload = false) {
   const timeStamp = dayjs().format(InnerKenTimeStampFormat)
   const backupHome = 'appendBackup'
   const command = [
@@ -57968,7 +57973,7 @@ async function backup (upload = false) {
   ]
 
   cli.executeInShell(command, program.debug)
-  if(upload){
+  if(!noUpload){
     setTimeout(() => {
       const homedir = __nccwpck_require__(12087).homedir()
       const fileName = [homedir, 'backups', timeStamp, `${timeStamp}@cli.sql`].join('/')

package/dist/patch/202107211050resetCronjob6.sh

@@ -8,8 +8,8 @@ echo "* * * * *  wget -O /dev/null http://localhost/PHP/AccessLog.php?op=reportS
 echo "* * * * *  /var/www/html/crontab.sh > /dev/null" >>conf
 echo "59 4 1 * *   wget -O /dev/null http://localhost/PHP/Datev.php?op=autoSendDatevCsv > /dev/null" >>conf
 echo "Innerken322." | sudo -S su aaden
-su -c aaden --command crontab -r
-su -c aaden --command crontab conf
+crontab -r
+crontab conf
 echo "Innerken322." | sudo -S rm -f conf
 echo "END CONFIG"
 crontab -l

package/index.js

@@ -37,11 +37,11 @@ program.command('load-new-version').action(loadNewVersion) // auto execute.
 program.command('local-version').action(() => {
   console.log('storage:' + getStorageBackendFileVersion())
 })
-program.command('backup [upload]').action(backup)
+program.command('backup [noUpload]').action(backup)
 program.command('ngrok').action(startNgrokService)
 program.command('update-ngrok-config <deviceId>').action(updateNgrokConfig)
 program.command('get-database').action(getDatabase)
-program.command('get-newdatabase').action(getnewDatabase)
+program.command('get-newdatabase').action(getNewDatabase)
 program.command('run <filePath>').action(run)
 program.command('patch').action(patch)
 program.command('check-tse').action(checkTse)
@@ -52,6 +52,7 @@ program.command('full-update').action(fullUpdate)
 program.command('return-terminal').action(returnTerminal)
 program.command('db').action(enterDatabase)
 program.command('printer-test').action(testPrinter)
+program.command('log').action(log)
 program.command('enable-mile-pay').action(enableMilePay)
 program.command('start-mile-pay').action(startService)
 program.command('mile-pay-option')
@@ -119,9 +120,13 @@ async function selectOption () {
   }
 }
 
+function log(){
+  cli.executeInShell(['tail -f /var/www/html/Resource/failLog.log'])
+}
+
 function enterDatabase () {
   const command = [
-    `mysql -uaaden -p -Daaden`
+    `mysql -uaaden -pInnerken322. -Daaden`
   ]
   cli.executeInShell(command, program.debug)
 }
@@ -141,7 +146,7 @@ function getDatabase () {
   cli.executeInShell(command, program.debug)
 }
 
-function getnewDatabase () {
+function getNewDatabase () {
   const command = [
     `mysqldump -uaaden -pInnerken322. --databases aaden --tables Attribute AttributeGroup BonTemplate Category_AttributeGroup DishWithName Dish_AttributeGroup Dishes DishesString DishesCategory DishesCategoryString DishesCategoryType DishesCategoryTypeString ConsumeType_Dishes_Free ConsumeType_Dishes_Show> transfer.sql`,
     'sudo cp transfer.sql /var/www/html'
@@ -267,7 +272,7 @@ async function startNgrokService () {
   cli.executeInShell(command, program.debug)
 }
 
-async function backup (upload = false) {
+async function backup (noUpload = false) {
   const timeStamp = dayjs().format(InnerKenTimeStampFormat)
   const backupHome = 'appendBackup'
   const command = [
@@ -286,7 +291,7 @@ async function backup (upload = false) {
   ]
 
   cli.executeInShell(command, program.debug)
-  if(upload){
+  if(!noUpload){
     setTimeout(() => {
       const homedir = require('os').homedir()
       const fileName = [homedir, 'backups', timeStamp, `${timeStamp}@cli.sql`].join('/')

package/package.json

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

package/patch/202107211050resetCronjob6.sh

@@ -8,8 +8,8 @@ echo "* * * * *  wget -O /dev/null http://localhost/PHP/AccessLog.php?op=reportS
 echo "* * * * *  /var/www/html/crontab.sh > /dev/null" >>conf
 echo "59 4 1 * *   wget -O /dev/null http://localhost/PHP/Datev.php?op=autoSendDatevCsv > /dev/null" >>conf
 echo "Innerken322." | sudo -S su aaden
-su -c aaden --command crontab -r
-su -c aaden --command crontab conf
+crontab -r
+crontab conf
 echo "Innerken322." | sudo -S rm -f conf
 echo "END CONFIG"
 crontab -l