aaden-cli 1.1.119 → 1.1.123

package/dist/patch/{addDatevCronJob.sh → 202105061454resetCronjob.sh}

@@ -1,15 +1,14 @@
 #!/bin/bash
 echo 'Start to Config cronjob.'
-cd || exit
-touch conf
+sudo crontab -r
+sudo touch conf
+sudo chmod 777 conf
 echo "0 */12 * * * wget -O /dev/null http://localhost/PHP/CloudStuff/ReportAllTerminalData.php" >>conf
 echo "* * * * * wget -O /dev/null http://localhost/PHP/CloudStuff/FetchOrdersForAllTerminal.php" >>conf
 echo "* * * * *  wget -O /dev/null http://localhost/PHP/AccessLog.php?op=reportStatus" >>conf
 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
 crontab -r
 crontab conf
-echo "Innerken322." | sudo -S rm -f conf
+sudo rm -f conf
 echo "END CONFIG"
 crontab -l

package/dist/patch/202105061658resetAutoUpgradeFixAuthProblem.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+sudo rm -rf /etc/cron.d/aaden-cli-upgrade
+
+sudo touch conf
+sudo chmod 777 conf
+
+echo "*/5 * * * * /usr/local/bin/aaden-cli auto-upgrade" >> conf
+
+sudo crontab conf
+sudo rm -f conf
+
+echo "END CONFIG"
+sudo crontab -l

package/dist/patch/202106151659resetAutoUpgradeFixAuthProblem.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+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  "*/5 * * * * /usr/local/bin/aaden-cli auto-upgrade" >>conf
+
+echo "Innerken322." | sudo -S crontab conf
+echo "Innerken322." | sudo -S rm -f conf
+
+echo  "END CONFIG"
+echo "Innerken322." | sudo -S crontab -l

package/generateFullSql.js

@@ -0,0 +1,21 @@
+const fs = require('fs')
+const sql = fs.readFileSync('sql/1.sql')
+
+
+const queries = sql.toString().split(';')
+const res = []
+queries.forEach(q => {
+  // console.log(q)
+  const lines = q.split('\n')
+  // console.log(lines)
+  const tableName = lines.find(l => l.includes('INTO'))
+  if (tableName) {
+    const realTableName = tableName.split('`')[1]
+    const ids = lines.filter(l => l.includes('(')).map(l => l.split('(')[1].split(',')[0])
+    const query = 'Delete from ' + realTableName + ' where id in (' + ids.join(',') + ');'
+    // console.log(query)
+    res.push(query)
+  }
+
+})
+fs.writeFileSync('sql/clean.sql', res.join('\n'))

package/index.js

@@ -37,7 +37,7 @@ program.command('load-new-version').action(loadNewVersion) // auto execute.
 program.command('local-version').action(() => {
   console.log('storage:' + getStorageBackendFileVersion())
 })
-program.command('backup [full]').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)
@@ -267,7 +267,7 @@ async function startNgrokService () {
   cli.executeInShell(command, program.debug)
 }
 
-async function backup (full = true) {
+async function backup (noUpload = false) {
   const timeStamp = dayjs().format(InnerKenTimeStampFormat)
   const backupHome = 'appendBackup'
   const command = [
@@ -277,7 +277,7 @@ async function backup (full = true) {
     'sudo mkdir -p backups/' + timeStamp,
     'sudo chmod 777 backups/' + timeStamp,
     'cd backups/' + timeStamp,
-    `mysqldump aaden -uaaden -pInnerken322. ${full ? '-c' : '-c -t'} > ${timeStamp}@cli.sql`,
+    `mysqldump aaden -uaaden -pInnerken322. -c> ${timeStamp}@cli.sql`,
     'cd',
     'sudo mkdir -p ' + backupHome,
     'sudo chmod 777 ' + backupHome,
@@ -286,11 +286,14 @@ async function backup (full = true) {
   ]
 
   cli.executeInShell(command, program.debug)
-  setTimeout(() => {
-    const homedir = require('os').homedir()
-    const fileName = [homedir, 'backups', timeStamp, `${timeStamp}@cli.sql`].join('/')
-    uploadFile(fileName)
-  }, 8000)
+  if(!noUpload){
+    setTimeout(() => {
+      const homedir = require('os').homedir()
+      const fileName = [homedir, 'backups', timeStamp, `${timeStamp}@cli.sql`].join('/')
+      uploadFile(fileName)
+    }, 8000)
+  }
+
 
 
 }

package/package.json

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