aaden-cli 1.1.184 → 1.2.3

package/dist/patch/202010030826fixAuthority.sh

@@ -1,30 +1,30 @@
-#!/bin/bash
-
-
-DeviceId=$(cat /var/www/html/Resource/config/config.ini | grep -e DeviceId | cut -d = -f 2 | grep '[1-9]*' | sed 's/"//g')
-aaden-cli update-ngrok-config $DeviceId
-
-
-ServiceFileName=/etc/systemd/system/aaden-ngrok.service
-
-sudo touch $ServiceFileName
-sudo chmod 777 $ServiceFileName
-echo -e "
-[Unit]
-Description=Ngrok Service For Aaden
-
-[Service]
-Type=simple
-Restart=always
-RestartSec=1
-User=root
-ExecStart=/usr/local/bin/aaden-cli ngrok
-
-[Install]
-WantedBy=multi-user.target
-" > $ServiceFileName
-
-sudo systemctl start aaden-ngrok.service
-sudo systemctl enable aaden-ngrok.service
-sudo systemctl daemon-reload
-
+#!/bin/bash
+
+
+DeviceId=$(cat /var/www/html/Resource/config/config.ini | grep -e DeviceId | cut -d = -f 2 | grep '[1-9]*' | sed 's/"//g')
+aaden-cli update-ngrok-config $DeviceId
+
+
+ServiceFileName=/etc/systemd/system/aaden-ngrok.service
+
+sudo touch $ServiceFileName
+sudo chmod 777 $ServiceFileName
+echo -e "
+[Unit]
+Description=Ngrok Service For Aaden
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+User=root
+ExecStart=/usr/local/bin/aaden-cli ngrok
+
+[Install]
+WantedBy=multi-user.target
+" > $ServiceFileName
+
+sudo systemctl start aaden-ngrok.service
+sudo systemctl enable aaden-ngrok.service
+sudo systemctl daemon-reload
+

package/dist/patch/202010291116addUsrLocalBinToRootPath.sh

@@ -1,11 +1,11 @@
-#!/bin/bash
-
-sudo touch conf
-sudo chmod 777 conf
-sudo cat /root/.bashrc >conf
-echo 'export PATH="/usr/local/bin:$PATH"' >>conf
-sudo mv /root/.bashrc /root/backup_bashrc
-sudo mv conf /root/.bashrc
-source ~/.bashrc
-sudo rm -f conf
-echo "END CONFIG"
+#!/bin/bash
+
+sudo touch conf
+sudo chmod 777 conf
+sudo cat /root/.bashrc >conf
+echo 'export PATH="/usr/local/bin:$PATH"' >>conf
+sudo mv /root/.bashrc /root/backup_bashrc
+sudo mv conf /root/.bashrc
+source ~/.bashrc
+sudo rm -f conf
+echo "END CONFIG"

package/dist/patch/202104081433aptUpgrade.sh

@@ -1,2 +1,2 @@
-sudo apt update
-sudo apt upgrade -y
+sudo apt update
+sudo apt upgrade -y

package/dist/patch/202105052136useAxelToDownload.sh

@@ -1,2 +1,2 @@
-#!/bin/bash
-sudo snap install axel
+#!/bin/bash
+sudo snap install axel

package/dist/patch/202105052148createWorkDir.sh

@@ -1,5 +1,5 @@
-#!/bin/bash
-sudo mkdir -p /etc/aaden/
-sudo chown -R aaden:aaden /etc/aaden
-mkdir -p /etc/aaden/files
-
+#!/bin/bash
+sudo mkdir -p /etc/aaden/
+sudo chown -R aaden:aaden /etc/aaden
+mkdir -p /etc/aaden/files
+

package/dist/patch/202107031201addVersionPHP.sh

@@ -1,8 +1,8 @@
-#!/bin/bash
-
-
-cd AadenDeploy/Utils || exit
-echo "Innerken322." | sudo -S cp -f MyVersion.php /var/www/html/PHP/
-echo "Innerken322." | sudo -S chmod 777 /var/www/html/PHP/MyVersion.php
-echo "Innerken322." | sudo -S apt-get install php-ssh2 -y
-echo "Innerken322." | sudo -S /etc/init.d/apache2 restart
+#!/bin/bash
+
+
+cd AadenDeploy/Utils || exit
+echo "Innerken322." | sudo -S cp -f MyVersion.php /var/www/html/PHP/
+echo "Innerken322." | sudo -S chmod 777 /var/www/html/PHP/MyVersion.php
+echo "Innerken322." | sudo -S apt-get install php-ssh2 -y
+echo "Innerken322." | sudo -S /etc/init.d/apache2 restart

package/dist/patch/202107081404snapStopRefresh.sh

@@ -1,3 +1,3 @@
-#!/bin/bash
-
-echo "Innerken322." | sudo -S snap set core experimental.refresh-app-awareness=true
+#!/bin/bash
+
+echo "Innerken322." | sudo -S snap set core experimental.refresh-app-awareness=true

package/dist/patch/202107121635AddPHPExtension.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
-
-echo "Innerken322." | sudo -S snap install axel
-echo "Innerken322." | sudo -S apt-get install php-ssh2 -y
-echo "Innerken322." | sudo -S apt-get install php-intl -y
-echo "Innerken322." | sudo -S /etc/init.d/apache2 restart
+#!/bin/bash
+
+echo "Innerken322." | sudo -S snap install axel
+echo "Innerken322." | sudo -S apt-get install php-ssh2 -y
+echo "Innerken322." | sudo -S apt-get install php-intl -y
+echo "Innerken322." | sudo -S /etc/init.d/apache2 restart

package/dist/patch/202107151032SnapStopRefresh2.sh

@@ -1,3 +1,3 @@
-#!/bin/bash
-
-echo "Innerken322." | sudo -S snap set core experimental.refresh-app-awareness=true
+#!/bin/bash
+
+echo "Innerken322." | sudo -S snap set core experimental.refresh-app-awareness=true

package/dist/patch/202107211049resetAutoUpgradeFixAuthProblem10.sh

@@ -1,16 +1,17 @@
-#!/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
+#!/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 -u root -r
+echo "Innerken322." | sudo -S crontab -u root conf
+echo "Innerken322." | sudo -S rm -f conf
+
+echo "Innerken322." | sudo -S crontab -l
+
+echo  "END CONFIG"

package/dist/patch/202204061112ResetCronTab19.sh

@@ -14,4 +14,14 @@ echo "Innerken322." | sudo -S rm -f conf
 echo "Innerken322." | sudo -S su aaden
 crontab -l -u aaden
 echo "END 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  "*/5 * * * * /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
+echo "Innerken322." | sudo -S crontab -l
+echo  "END CONFIG"
+
 

package/generateFullSql.js

@@ -1,21 +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'))
+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

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 
+
+//请千万注意，本文将只能用LF！！！
+
 const dayjs = require('dayjs')
 const colors = require('colors')
 const fs = require('fs')
@@ -53,6 +56,7 @@ program.command('return-terminal').action(returnTerminal)
 program.command('db').action(enterDatabase)
 program.command('printer-test').action(testPrinter)
 program.command('log').action(log)
+program.command('fix-cronjob').action(fixCronJob)
 program.command('enable-mile-pay').action(enableMilePay)
 program.command('start-mile-pay').action(startService)
 program.command('convert-database').action(convertDataBaseCharset)
@@ -174,6 +178,13 @@ function enableTSE () {
   runMultiple(files)
 }
 
+function fixCronJob(){
+  const files = ['AadenDeploy/Utils/fixCronJob.sh']
+  runMultiple(files)
+}
+
+
+
 async function patch () {
   const configRoot = '/etc/aaden/config'
   const rootPath = __dirname + '/patch'

package/modules/cli-utils.js

@@ -1,42 +1,42 @@
-const util = require('util')
-const colors = require('colors')
-const spawn = require('child_process').spawn
-
-function getLine (char, lineLength = 20) {
-  return char.repeat(lineLength)
-}
-
-function commandBuilder (arr) {
-  return arr.join(' && ')
-}
-
-function showCommand (arr) {
-  console.log(getLine('>'))
-  console.log(arr.join('\n').cyan)
-  console.log('')
-}
-
-function executeInShell (cmd, debug = false) {
-  let _cmd = commandBuilder(cmd)
-  try {
-    showCommand(cmd)
-    if (debug) {
-      return
-    }
-    spawn(_cmd, [], {
-      shell: true,
-      stdio: 'inherit'
-    })
-  } catch (e) {
-    console.log(getLine('*'))
-    console.log(e.bgRed)
-    console.log(_cmd)
-    console.log(getLine('*'))
-  }
-  console.log(getLine('*'))
-}
-
-module.exports = {
-  getLine,
-  executeInShell
-}
+const util = require('util')
+const colors = require('colors')
+const spawn = require('child_process').spawn
+
+function getLine (char, lineLength = 20) {
+  return char.repeat(lineLength)
+}
+
+function commandBuilder (arr) {
+  return arr.join(' && ')
+}
+
+function showCommand (arr) {
+  console.log(getLine('>'))
+  console.log(arr.join('\n').cyan)
+  console.log('')
+}
+
+function executeInShell (cmd, debug = false) {
+  let _cmd = commandBuilder(cmd)
+  try {
+    showCommand(cmd)
+    if (debug) {
+      return
+    }
+    spawn(_cmd, [], {
+      shell: true,
+      stdio: 'inherit'
+    })
+  } catch (e) {
+    console.log(getLine('*'))
+    console.log(e.bgRed)
+    console.log(_cmd)
+    console.log(getLine('*'))
+  }
+  console.log(getLine('*'))
+}
+
+module.exports = {
+  getLine,
+  executeInShell
+}

package/package.json

@@ -1,41 +1,41 @@
-{
-  "name": "aaden-cli",
-  "version": "1.1.184",
-  "description": "",
-  "main": "dist/index.js",
-  "scripts": {
-    "test": "node test.js",
-    "update": "ncc build index.js -o dist && git add . && release-it --ci"
-  },
-  "bin": {
-    "aaden-cli": "./dist/index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/innerken-gmbh/aaden-cli.git"
-  },
-  "keywords": [],
-  "author": "JuHaodong@innerken",
-  "license": "ISC",
-  "release-it": {
-    "github.release": true,
-    "git": {
-      "commitMessage": "aaden-cli: release v${version}",
-      "requireCleanWorkingDir": false
-    }
-  },
-  "devDependencies": {
-    "@vercel/ncc": "^0.28.5",
-    "colors": "^1.4.0",
-    "commander": "^5.1.0",
-    "dayjs": "^1.9.6",
-    "hillo": "^1.1.12",
-    "innerken-js-utils": "^1.0.6",
-    "prompts": "^2.4.0",
-    "read-ini-file": "^3.0.0",
-    "release-it": "^13.6.3"
-  },
-  "dependencies": {
-    "aws-sdk": "^2.1046.0"
-  }
-}
+{
+  "name": "aaden-cli",
+  "version": "1.2.3",
+  "description": "",
+  "main": "dist/index.js",
+  "scripts": {
+    "test": "node test.js",
+    "update": "ncc build index.js -o dist && git add . && release-it --ci"
+  },
+  "bin": {
+    "aaden-cli": "./dist/index.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/innerken-gmbh/aaden-cli.git"
+  },
+  "keywords": [],
+  "author": "JuHaodong@innerken",
+  "license": "ISC",
+  "release-it": {
+    "github.release": true,
+    "git": {
+      "commitMessage": "aaden-cli: release v${version}",
+      "requireCleanWorkingDir": false
+    }
+  },
+  "devDependencies": {
+    "@vercel/ncc": "^0.28.5",
+    "colors": "^1.4.0",
+    "commander": "^5.1.0",
+    "dayjs": "^1.9.6",
+    "hillo": "^1.1.12",
+    "innerken-js-utils": "^1.0.6",
+    "prompts": "^2.4.0",
+    "read-ini-file": "^3.0.0",
+    "release-it": "^13.6.3"
+  },
+  "dependencies": {
+    "aws-sdk": "^2.1046.0"
+  }
+}

package/patch/202010030826fixAuthority.sh

@@ -1,30 +1,30 @@
-#!/bin/bash
-
-
-DeviceId=$(cat /var/www/html/Resource/config/config.ini | grep -e DeviceId | cut -d = -f 2 | grep '[1-9]*' | sed 's/"//g')
-aaden-cli update-ngrok-config $DeviceId
-
-
-ServiceFileName=/etc/systemd/system/aaden-ngrok.service
-
-sudo touch $ServiceFileName
-sudo chmod 777 $ServiceFileName
-echo -e "
-[Unit]
-Description=Ngrok Service For Aaden
-
-[Service]
-Type=simple
-Restart=always
-RestartSec=1
-User=root
-ExecStart=/usr/local/bin/aaden-cli ngrok
-
-[Install]
-WantedBy=multi-user.target
-" > $ServiceFileName
-
-sudo systemctl start aaden-ngrok.service
-sudo systemctl enable aaden-ngrok.service
-sudo systemctl daemon-reload
-
+#!/bin/bash
+
+
+DeviceId=$(cat /var/www/html/Resource/config/config.ini | grep -e DeviceId | cut -d = -f 2 | grep '[1-9]*' | sed 's/"//g')
+aaden-cli update-ngrok-config $DeviceId
+
+
+ServiceFileName=/etc/systemd/system/aaden-ngrok.service
+
+sudo touch $ServiceFileName
+sudo chmod 777 $ServiceFileName
+echo -e "
+[Unit]
+Description=Ngrok Service For Aaden
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+User=root
+ExecStart=/usr/local/bin/aaden-cli ngrok
+
+[Install]
+WantedBy=multi-user.target
+" > $ServiceFileName
+
+sudo systemctl start aaden-ngrok.service
+sudo systemctl enable aaden-ngrok.service
+sudo systemctl daemon-reload
+

package/patch/202010291116addUsrLocalBinToRootPath.sh

@@ -1,11 +1,11 @@
-#!/bin/bash
-
-sudo touch conf
-sudo chmod 777 conf
-sudo cat /root/.bashrc >conf
-echo 'export PATH="/usr/local/bin:$PATH"' >>conf
-sudo mv /root/.bashrc /root/backup_bashrc
-sudo mv conf /root/.bashrc
-source ~/.bashrc
-sudo rm -f conf
-echo "END CONFIG"
+#!/bin/bash
+
+sudo touch conf
+sudo chmod 777 conf
+sudo cat /root/.bashrc >conf
+echo 'export PATH="/usr/local/bin:$PATH"' >>conf
+sudo mv /root/.bashrc /root/backup_bashrc
+sudo mv conf /root/.bashrc
+source ~/.bashrc
+sudo rm -f conf
+echo "END CONFIG"

package/patch/202104081433aptUpgrade.sh

@@ -1,2 +1,2 @@
-sudo apt update
-sudo apt upgrade -y
+sudo apt update
+sudo apt upgrade -y

package/patch/202105052136useAxelToDownload.sh

@@ -1,2 +1,2 @@
-#!/bin/bash
-sudo snap install axel
+#!/bin/bash
+sudo snap install axel

package/patch/202105052148createWorkDir.sh

@@ -1,5 +1,5 @@
-#!/bin/bash
-sudo mkdir -p /etc/aaden/
-sudo chown -R aaden:aaden /etc/aaden
-mkdir -p /etc/aaden/files
-
+#!/bin/bash
+sudo mkdir -p /etc/aaden/
+sudo chown -R aaden:aaden /etc/aaden
+mkdir -p /etc/aaden/files
+

package/patch/202107031201addVersionPHP.sh

@@ -1,8 +1,8 @@
-#!/bin/bash
-
-
-cd AadenDeploy/Utils || exit
-echo "Innerken322." | sudo -S cp -f MyVersion.php /var/www/html/PHP/
-echo "Innerken322." | sudo -S chmod 777 /var/www/html/PHP/MyVersion.php
-echo "Innerken322." | sudo -S apt-get install php-ssh2 -y
-echo "Innerken322." | sudo -S /etc/init.d/apache2 restart
+#!/bin/bash
+
+
+cd AadenDeploy/Utils || exit
+echo "Innerken322." | sudo -S cp -f MyVersion.php /var/www/html/PHP/
+echo "Innerken322." | sudo -S chmod 777 /var/www/html/PHP/MyVersion.php
+echo "Innerken322." | sudo -S apt-get install php-ssh2 -y
+echo "Innerken322." | sudo -S /etc/init.d/apache2 restart

package/patch/202107081404snapStopRefresh.sh

@@ -1,3 +1,3 @@
-#!/bin/bash
-
-echo "Innerken322." | sudo -S snap set core experimental.refresh-app-awareness=true
+#!/bin/bash
+
+echo "Innerken322." | sudo -S snap set core experimental.refresh-app-awareness=true

package/patch/202107121635AddPHPExtension.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
-
-echo "Innerken322." | sudo -S snap install axel
-echo "Innerken322." | sudo -S apt-get install php-ssh2 -y
-echo "Innerken322." | sudo -S apt-get install php-intl -y
-echo "Innerken322." | sudo -S /etc/init.d/apache2 restart
+#!/bin/bash
+
+echo "Innerken322." | sudo -S snap install axel
+echo "Innerken322." | sudo -S apt-get install php-ssh2 -y
+echo "Innerken322." | sudo -S apt-get install php-intl -y
+echo "Innerken322." | sudo -S /etc/init.d/apache2 restart

package/patch/202107151032SnapStopRefresh2.sh

@@ -1,3 +1,3 @@
-#!/bin/bash
-
-echo "Innerken322." | sudo -S snap set core experimental.refresh-app-awareness=true
+#!/bin/bash
+
+echo "Innerken322." | sudo -S snap set core experimental.refresh-app-awareness=true

package/patch/202107211049resetAutoUpgradeFixAuthProblem10.sh

@@ -1,16 +1,17 @@
-#!/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
+#!/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 -u root -r
+echo "Innerken322." | sudo -S crontab -u root conf
+echo "Innerken322." | sudo -S rm -f conf
+
+echo "Innerken322." | sudo -S crontab -l
+
+echo  "END CONFIG"