aaden-cli 1.1.184 → 1.2.1

package/README.md

@@ -1,37 +1,37 @@
-# aaden-cli
-
-Aaden系统的Cli应用.
-
-usage:
-
-```
-$ >npm istall -g aaden-cli
-
-$ >aaden-cli
-                    _               _____ _      _____
-     /\            | |             / ____| |    |_   _|
-    /  \   __ _  __| | ___ _ __   | |    | |      | |
-   / /\ \ / _` |/ _` |/ _ \ '_ \  | |    | |      | |
-  / ____ \ (_| | (_| |  __/ | | | | |____| |____ _| |_
- /_/    \_\__,_|\__,_|\___|_| |_|  \_____|______|_____|
-
-
-Aaden@InnerKen CLI Version:1.0.19
-
-
-Usage: index [options] [command]
-
-Options:
-  -V, --version                           output the version number
-  -d, --debug                             use Debug Out put
-  -h, --help                              display help for command
-
-Commands:
-  update [channel]
-  install [options] <deviceId> [channel]
-  setup-wifi
-  upgrade
-  where
-  help [command]                          display help for command
-
-```
+# aaden-cli
+
+Aaden系统的Cli应用.
+
+usage:
+
+```
+$ >npm istall -g aaden-cli
+
+$ >aaden-cli
+                    _               _____ _      _____
+     /\            | |             / ____| |    |_   _|
+    /  \   __ _  __| | ___ _ __   | |    | |      | |
+   / /\ \ / _` |/ _` |/ _ \ '_ \  | |    | |      | |
+  / ____ \ (_| | (_| |  __/ | | | | |____| |____ _| |_
+ /_/    \_\__,_|\__,_|\___|_| |_|  \_____|______|_____|
+
+
+Aaden@InnerKen CLI Version:1.0.19
+
+
+Usage: index [options] [command]
+
+Options:
+  -V, --version                           output the version number
+  -d, --debug                             use Debug Out put
+  -h, --help                              display help for command
+
+Commands:
+  update [channel]
+  install [options] <deviceId> [channel]
+  setup-wifi
+  upgrade
+  where
+  help [command]                          display help for command
+
+```

package/aws.js

@@ -1,42 +1,42 @@
-const AWS = require('aws-sdk')
-const fs = require('fs')
-
-const id = 'AKIA4TTJEQRYQ7CBPK5W'
-const secret = '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'
-const bucketName = 'aaden-backup-bucket'
-
-const s3 = new AWS.S3({
-  accessKeyId: id,
-  secretAccessKey: secret
-})
-
-function getMyDeviceId () {
-  const loadIniFile = require('read-ini-file')
-  try {
-    return loadIniFile.sync('/var/www/html/Resource/config/config.ini').Device.DeviceId
-  } catch (e) {
-    return -1
-  }
-
-}
-
-const uploadFile = (fileName) => {
-  const fileContent = fs.readFileSync(fileName)
-
-  const params = {
-    Bucket: bucketName,
-    Key: getMyDeviceId() + '/backups/' + 'backup.sql',
-    Body: fileContent
-  }
-
-  s3.upload(params, function (err, data) {
-    if (err) {
-      throw err
-    }
-    console.log(`File uploaded successfully. ${data.Location}`)
-  })
-}
-
-module.exports = {
-  uploadFile
-}
+const AWS = require('aws-sdk')
+const fs = require('fs')
+
+const id = 'AKIA4TTJEQRYQ7CBPK5W'
+const secret = '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'
+const bucketName = 'aaden-backup-bucket'
+
+const s3 = new AWS.S3({
+  accessKeyId: id,
+  secretAccessKey: secret
+})
+
+function getMyDeviceId () {
+  const loadIniFile = require('read-ini-file')
+  try {
+    return loadIniFile.sync('/var/www/html/Resource/config/config.ini').Device.DeviceId
+  } catch (e) {
+    return -1
+  }
+
+}
+
+const uploadFile = (fileName) => {
+  const fileContent = fs.readFileSync(fileName)
+
+  const params = {
+    Bucket: bucketName,
+    Key: getMyDeviceId() + '/backups/' + 'backup.sql',
+    Body: fileContent
+  }
+
+  s3.upload(params, function (err, data) {
+    if (err) {
+      throw err
+    }
+    console.log(`File uploaded successfully. ${data.Location}`)
+  })
+}
+
+module.exports = {
+  uploadFile
+}

package/dist/index.js

@@ -5,48 +5,48 @@
 /***/ 3483:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
-const AWS = __nccwpck_require__(71786)
-const fs = __nccwpck_require__(35747)
-
-const id = 'AKIA4TTJEQRYQ7CBPK5W'
-const secret = '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'
-const bucketName = 'aaden-backup-bucket'
-
-const s3 = new AWS.S3({
-  accessKeyId: id,
-  secretAccessKey: secret
-})
-
-function getMyDeviceId () {
-  const loadIniFile = __nccwpck_require__(89264)
-  try {
-    return loadIniFile.sync('/var/www/html/Resource/config/config.ini').Device.DeviceId
-  } catch (e) {
-    return -1
-  }
-
-}
-
-const uploadFile = (fileName) => {
-  const fileContent = fs.readFileSync(fileName)
-
-  const params = {
-    Bucket: bucketName,
-    Key: getMyDeviceId() + '/backups/' + 'backup.sql',
-    Body: fileContent
-  }
-
-  s3.upload(params, function (err, data) {
-    if (err) {
-      throw err
-    }
-    console.log(`File uploaded successfully. ${data.Location}`)
-  })
-}
-
-module.exports = {
-  uploadFile
-}
+const AWS = __nccwpck_require__(71786)
+const fs = __nccwpck_require__(35747)
+
+const id = 'AKIA4TTJEQRYQ7CBPK5W'
+const secret = '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'
+const bucketName = 'aaden-backup-bucket'
+
+const s3 = new AWS.S3({
+  accessKeyId: id,
+  secretAccessKey: secret
+})
+
+function getMyDeviceId () {
+  const loadIniFile = __nccwpck_require__(89264)
+  try {
+    return loadIniFile.sync('/var/www/html/Resource/config/config.ini').Device.DeviceId
+  } catch (e) {
+    return -1
+  }
+
+}
+
+const uploadFile = (fileName) => {
+  const fileContent = fs.readFileSync(fileName)
+
+  const params = {
+    Bucket: bucketName,
+    Key: getMyDeviceId() + '/backups/' + 'backup.sql',
+    Body: fileContent
+  }
+
+  s3.upload(params, function (err, data) {
+    if (err) {
+      throw err
+    }
+    console.log(`File uploaded successfully. ${data.Location}`)
+  })
+}
+
+module.exports = {
+  uploadFile
+}
 
 
 /***/ }),
@@ -54,48 +54,48 @@ module.exports = {
 /***/ 74713:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
-const util = __nccwpck_require__(31669)
-const colors = __nccwpck_require__(83045)
-const spawn = __nccwpck_require__(63129).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 = __nccwpck_require__(31669)
+const colors = __nccwpck_require__(83045)
+const spawn = __nccwpck_require__(63129).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
+}
 
 
 /***/ }),
@@ -57924,7 +57924,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.183"};
+module.exports = {"i8":"1.2.0"};
 
 /***/ }),
 
@@ -58144,6 +58144,9 @@ var __webpack_exports__ = {};
 // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
 (() => {
 
+
+//请千万注意，本文将只能用LF！！！
+
 const dayjs = __nccwpck_require__(7401)
 const colors = __nccwpck_require__(83045)
 const fs = __nccwpck_require__(35747)

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/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')