aaden-cli 1.2.23 → 1.2.25

package/AadenDeploy/mountTSE.sh

@@ -1,15 +1,10 @@
 #!/bin/bash
 
-TSE_PATH=$(sudo fdisk -l | grep 7,5 | cut -d ' ' -f 1)
-echo "TSE_PATH:$TSE_PATH"
-UUID=$(sudo blkid $TSE_PATH | cut -d "=" -f 3 | cut -d '"' -f 2)
-echo "UUID:$UUID"
-
 sudo mkdir -p "/media/aaden/SWISSBIT"
 sudo touch tmp
 sudo chmod 777 tmp
 sudo cat /etc/fstab >tmp
-echo "UUID=$UUID /media/aaden/SWISSBIT vfat defaults 0 2" >>tmp
+echo "UUID=5AFD-8706 /media/aaden/SWISSBIT vfat defaults 0 2" >>tmp
 sudo mv /etc/fstab /etc/fstab.backup
 sudo mv tmp /etc/fstab
 echo 'END AUTO CONFIG'

package/dist/index.js

@@ -58161,7 +58161,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.2.22"};
+module.exports = {"i8":"1.2.24"};
 
 /***/ }),
 
@@ -58450,6 +58450,14 @@ program.command('enable-resource-track').action(enableResourceTrack)
 program.command('start-resource-track').action(startResourceTrack)
 program.command('auto-send-mail').action(editIni)
 program.command('auto-send-summary').action(autoSendSummaryLastMonth)
+program.command('set-do-not-send-zbon-when-print-true').
+  action(editConfigIni(setConfig('Email', 'DoNotSendZbonWhenPrint', true)))
+program.command('set-do-not-send-zbon-when-print-false').
+  action(editConfigIni(setConfig('Email', 'DoNotSendZbonWhenPrint', false)))
+program.command('set-auto-send-3in1-today-true').
+  action(editConfigIni(setConfig('Email', 'AutoSend3in1Today', true)))
+program.command('set-auto-send-3in1-today-false').
+  action(editConfigIni(setConfig('Email', 'AutoSend3in1Today', false)))
 
 if (program.debug) {
   debugInfo()
@@ -59073,18 +59081,13 @@ function editIni () {
   cli.executeInShell([
     'sudo chmod 777 /var/www/html/Resource/config/config.ini',
     'aaden-cli fix-cronjob',
-  ],program.debug)
-  const ini = __nccwpck_require__(80045)
-  const filePath = '/var/www/html/Resource/config/config.ini'
-  const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
-  console.log(info)
-  if(!info.Email) {
-    info.Email  = {}
-  }
-  info.Email.AutoSend3in1LastMonth = true
-
-  fs.writeFileSync(filePath, ini.stringify(info))
+  ], program.debug)
 
+  editConfigIni(composeMany([
+    setConfig('Email', 'AutoSend3in1LastMonth', true),
+    setConfig('Email', 'DoNotSendZbonWhenPrint', true),
+    setConfig('Email', 'AutoSend3in1Today', false),
+  ]))()
 }
 
 function autoSendSummaryLastMonth () {
@@ -59092,17 +59095,32 @@ function autoSendSummaryLastMonth () {
     'sudo chmod 777 /var/www/html/Resource/config/config.ini',
     'aaden-cli fix-cronjob',
   ], program.debug)
-  const ini = __nccwpck_require__(80045)
-  const filePath = '/var/www/html/Resource/config/config.ini'
-  const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
-  console.log(info)
-  if (!info.Email) {
-    info.Email = {}
+
+  editConfigIni(setConfig('Email', 'AutoSendSummaryLastMonth', true))()
+}
+
+function editConfigIni (f) {
+  return () => {
+    const ini = __nccwpck_require__(80045)
+    const filePath = '/var/www/html/Resource/config/config.ini'
+    const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
+    f(info)
+    fs.writeFileSync(filePath, ini.stringify(info))
   }
-  info.Email.AutoSendSummaryLastMonth = true
+}
 
-  fs.writeFileSync(filePath, ini.stringify(info))
+function setConfig (section, key, value) {
+  return file => {
+    if (!file[section]) {
+      file[section] = {}
+    }
+    file[section][key] = value
+    return file
+  }
+}
 
+function composeMany (fs) {
+  return fs.reduce((f, g) => x => g(f(x)), x => x)
 }
 
 function getPrivilegeCMD (path, pri = '+x', relativePath = true) {

package/index.js

@@ -69,6 +69,14 @@ program.command('enable-resource-track').action(enableResourceTrack)
 program.command('start-resource-track').action(startResourceTrack)
 program.command('auto-send-mail').action(editIni)
 program.command('auto-send-summary').action(autoSendSummaryLastMonth)
+program.command('set-do-not-send-zbon-when-print-true').
+  action(editConfigIni(setConfig('Email', 'DoNotSendZbonWhenPrint', true)))
+program.command('set-do-not-send-zbon-when-print-false').
+  action(editConfigIni(setConfig('Email', 'DoNotSendZbonWhenPrint', false)))
+program.command('set-auto-send-3in1-today-true').
+  action(editConfigIni(setConfig('Email', 'AutoSend3in1Today', true)))
+program.command('set-auto-send-3in1-today-false').
+  action(editConfigIni(setConfig('Email', 'AutoSend3in1Today', false)))
 
 if (program.debug) {
   debugInfo()
@@ -692,18 +700,13 @@ function editIni () {
   cli.executeInShell([
     'sudo chmod 777 /var/www/html/Resource/config/config.ini',
     'aaden-cli fix-cronjob',
-  ],program.debug)
-  const ini = require("ini")
-  const filePath = '/var/www/html/Resource/config/config.ini'
-  const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
-  console.log(info)
-  if(!info.Email) {
-    info.Email  = {}
-  }
-  info.Email.AutoSend3in1LastMonth = true
-
-  fs.writeFileSync(filePath, ini.stringify(info))
+  ], program.debug)
 
+  editConfigIni(composeMany([
+    setConfig('Email', 'AutoSend3in1LastMonth', true),
+    setConfig('Email', 'DoNotSendZbonWhenPrint', true),
+    setConfig('Email', 'AutoSend3in1Today', false),
+  ]))()
 }
 
 function autoSendSummaryLastMonth () {
@@ -711,17 +714,32 @@ function autoSendSummaryLastMonth () {
     'sudo chmod 777 /var/www/html/Resource/config/config.ini',
     'aaden-cli fix-cronjob',
   ], program.debug)
-  const ini = require("ini")
-  const filePath = '/var/www/html/Resource/config/config.ini'
-  const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
-  console.log(info)
-  if (!info.Email) {
-    info.Email = {}
+
+  editConfigIni(setConfig('Email', 'AutoSendSummaryLastMonth', true))()
+}
+
+function editConfigIni (f) {
+  return () => {
+    const ini = require('ini')
+    const filePath = '/var/www/html/Resource/config/config.ini'
+    const info = ini.parse(fs.readFileSync(filePath, 'utf-8'))
+    f(info)
+    fs.writeFileSync(filePath, ini.stringify(info))
   }
-  info.Email.AutoSendSummaryLastMonth = true
+}
 
-  fs.writeFileSync(filePath, ini.stringify(info))
+function setConfig (section, key, value) {
+  return file => {
+    if (!file[section]) {
+      file[section] = {}
+    }
+    file[section][key] = value
+    return file
+  }
+}
 
+function composeMany (fs) {
+  return fs.reduce((f, g) => x => g(f(x)), x => x)
 }
 
 function getPrivilegeCMD (path, pri = '+x', relativePath = true) {

package/package.json

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