General fixes & optimizations

Author: VR-25

build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 # Installation Archives Builder
-# Copyright 2018-2022, VR25
+# Copyright 2018-2024, VR25
 # License: GPLv3+
 #
 # usage: $0 [any_random_arg]
@@ -13,7 +13,6 @@
 
 . ./check-syntax.sh || exit $?
 
-
 set_prop() {
   sed -i -e "s/^($1=.*/($1=$2/" -e "s/^$1=.*/$1=$2/" \
     ${3:-module.prop} 2>/dev/null

install/acc.sh

@@ -498,7 +498,7 @@ case "${1-}" in
   ;;
 
   -ss::)
-    sort $dataDir/logs/working-switches.log | nl -s ") " -w 2 -v 1
+    set_prop_ $1
   ;;
 
   -sv)
@@ -543,12 +543,6 @@ case "${1-}" in
         cat $TMPDIR/ch-switches $_parsed 2>/dev/null > $parsed \
           && sort -u $parsed | sed 's/ $//; /^$/d' > $TMPDIR/ch-switches
       fi
-      if [ -f $TMPDIR/.sw ]; then
-        while IFS= read line; do
-          [ -n "$line" ] || continue
-          ! grep -q "$line " $TMPDIR/.sw || sed -i "\|$line|d" $dataDir/logs/write.log
-        done < $dataDir/logs/write.log
-      fi
       cp -f $logF $logF_ 2>/dev/null
       ! $daemonWasUp || start-stop-daemon -bx $TMPDIR/.accdt -S --
       exit $exitCode

install/batt-interface.sh

@@ -245,6 +245,8 @@ battCapacity=$batt/capacity
 battStatus=$battStatus
 currFile=$currFile
 curThen=$curThen
+idleThreshold=${idleThreshold:-40}
+_STI=${_STI:-15}
 temp=$temp
 voltNow=$voltNow" > $TMPDIR/.batt-interface.sh
 

install/misc-functions.sh

@@ -66,10 +66,9 @@ at() {
   local file=$TMPDIR/schedules/${1/:}
   if [ ! -f $file ] && [ $(date +%H%M) -ge ${file##*/} ] && [ $(date +%H) -eq ${1%:*} ]; then
     mkdir -p ${file%/*}
-    touch $file
     shift
-    set -- $(echo "$@" | sed 's/,/\;/g; s|^acc|/dev/acc|g; s| acc| /dev/acc|g')
-    eval "$@" || :
+    echo "$@" | sed 's/,/\;/g; s|^acc|/dev/acc|g; s| acc| /dev/acc|g' > $file
+    . $file || :
   elif [ $(date +%H%M) -lt ${file##*/} ]; then
     rm $file 2>/dev/null || :
   fi
@@ -132,8 +131,6 @@ disable_charging() {
 
   local autoMode=true
 
-  # not_charging || {
-
     [[ "${chargingSwitch[*]-}" != *\ -- ]] || autoMode=false
 
     if [[ "${chargingSwitch[0]-}" = */* ]]; then
@@ -161,7 +158,6 @@ disable_charging() {
 
     (set +eux; eval '${runCmdOnPause-}') || :
     chDisabledByAcc=true
-  # }
 
   if [ -n "${1-}" ]; then
     case $1 in
@@ -207,8 +203,6 @@ disable_charging() {
 
 enable_charging() {
 
-  # ! not_charging || {
-
     [ ! -f $TMPDIR/.sw ] || (. $TMPDIR/.sw; rm $TMPDIR/.sw; flip_sw on) 2>/dev/null || :
 
     if ! $ghostCharging || { $ghostCharging && online; }; then
@@ -232,7 +226,6 @@ enable_charging() {
     fi
 
     chDisabledByAcc=false
-  # }
 
   set_temp_level
 
@@ -417,9 +410,8 @@ write() {
     case "$(grep -E "^(#$2|$2)$" $f 2>/dev/null || :)" in
       \#*) blacklisted=true;;
       */*) eval "echo $1 > $2" || i=x;;
-      *) echo \#$2 >> $f
-         eval "echo $1 > $2" || i=x
-         sed -i "s|^#$2$|$2|" $f;;
+      *) echo $2 >> $f
+         eval "echo $1 > $2" || i=x;;
     esac
   else
     i=x