ensure line spacing between config blocks

- fixes #18
OneCDOnly · May 11, 2024 · 2529c0d · 2529c0d
1 parent 0c59adb
commit 2529c0d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/build/SortMyQPKGs_240511.qpkg b/build/SortMyQPKGs_240511.qpkg
diff --git a/build/SortMyQPKGs_240511.qpkg.md5 b/build/SortMyQPKGs_240511.qpkg.md5
@@ -0,0 +1 @@
+5b63caccf389738288b95000aab06651  build/SortMyQPKGs_240511.qpkg
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,5 +1,7 @@
-* Minor update: (unreleased)
+* Minor update: (240511)
 - add [QJDK21] to the ALPHA list.
+- add [SortMyQPKGs] to the OMEGA list.
+- ensure line spacing between config blocks.
 - and a few code upgrades.
 
 * Minor update: (240427)

diff --git a/qpkg.cfg b/qpkg.cfg
@@ -1,5 +1,5 @@
 QPKG_NAME="SortMyQPKGs"
-QPKG_VER="240427"
+QPKG_VER="240511"
 QPKG_AUTHOR="OneCD"
 QPKG_RC_NUM="500"
 QPKG_SERVICE_PROGRAM="sortmyqpkgs.sh"

diff --git a/shared/OMEGA.default b/shared/OMEGA.default
@@ -111,6 +111,7 @@ SurveillanceStation # load late due to long startup time
 OpenHab3            # load late due to long startup time
 NotificationCenter  # give netmgr more time to start
 Traefik             # load after all web services
+SortMyQPKGs
 
 # only run after everything else...
 RunLast
diff --git a/shared/sortmyqpkgs.sh b/shared/sortmyqpkgs.sh
@@ -91,8 +91,6 @@ Init()
         PKGS_OMEGA_ORDERED+=("$package_ref")
     done < "$actual_omega_pathfile"
 
-    PKGS_OMEGA_ORDERED+=("$QPKG_NAME")
-
     }
 
 BackupConfig()
@@ -252,6 +250,10 @@ SortPackages()
     local b=''
     local -i i=0
 
+    echo -e "\nsorting packages ..."
+
+#     time {
+
     # read 'ALPHA' packages in reverse and prepend each to /etc/config/qpkg.conf
     for ((i=${#PKGS_ALPHA_ORDERED[@]}-1; i>=0; i--)); do
         for a in $(/bin/grep '^\[' /etc/config/qpkg.conf); do
@@ -270,6 +272,7 @@ SortPackages()
             break
         done
     done
+#     }
 
     }
 
@@ -278,7 +281,7 @@ SendToStart()
 
     # sends $1 to the start of /etc/config/qpkg.conf
 
-    local a=$(ShowDataBlock "$1")
+    local a=$(GetDataBlock "$1")
 
     if [[ $? -gt 0 ]]; then
         echo "error - ${a}!"
@@ -297,19 +300,19 @@ SendToEnd()
 
     # sends $1 to the end of /etc/config/qpkg.conf
 
-    local a=$(ShowDataBlock "$1")
+    local a=$(GetDataBlock "$1")
 
     if [[ $? -gt 0 ]]; then
         echo "error - ${a}!"
         return 2
     fi
 
     /sbin/rmcfg "$1" -f /etc/config/qpkg.conf
-    echo -e "${a}\n" >> /etc/config/qpkg.conf
+    echo -e "\n${a}" >> /etc/config/qpkg.conf
 
     }
 
-ShowDataBlock()
+GetDataBlock()
     {
 
     # returns the data block for the QPKG name specified as $1
@@ -333,7 +336,7 @@ ShowDataBlock()
     bl=$(/usr/bin/tail -n$((ll-sl)) < /etc/config/qpkg.conf | /bin/grep -n '^\[' | /usr/bin/head -n1 | /usr/bin/cut -f1 -d':')
     [[ $bl -ne 0 ]] && el=$((sl+bl-1)) || el=$ll
 
-    /bin/sed -n "$sl,${el}p" /etc/config/qpkg.conf
+    echo -e "$(/bin/sed -n "$sl,${el}p" /etc/config/qpkg.conf)"     # Output this with 'echo' to strip trailing LFs from config block.
 
     }
 
@@ -532,7 +535,7 @@ case $1 in
         RecordOperationComplete "$1"
         CommitLog
         ;;
-    backup)
+    b|backup)
         RecordOperationRequest "$1"
         BackupConfig
         RecordOperationComplete "$1"
@@ -587,7 +590,7 @@ case $1 in
         RecordOperationComplete "$1"
         CommitLog
         ;;
-	status)
+	s|status)
         if /bin/grep -q 'sortmyqpkgs.sh' $SHUTDOWN_PATHFILE; then
 			echo active
 			exit 0