From 54edfd33c521725d06b11d5bbe7ce27b0c1a2cf0 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Tue, 25 Jul 2023 07:40:33 +0200
Subject: [PATCH 01/15] reduce console spam by copy operations

---
 source/nut/etc/rc.d/rc.nut   | 2 +-
 source/nut/install/doinst.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/nut/etc/rc.d/rc.nut b/source/nut/etc/rc.d/rc.nut
index 09f821e3..86356311 100755
--- a/source/nut/etc/rc.d/rc.nut
+++ b/source/nut/etc/rc.d/rc.nut
@@ -205,7 +205,7 @@ write_config() {
         mkdir $PLGPATH/ups
     fi
 	
-    cp -f /etc/nut/* $PLGPATH/ups
+    cp -f /etc/nut/* $PLGPATH/ups >/dev/null 2>&1
  
     # update permissions
     if [ -d /etc/nut ]; then
diff --git a/source/nut/install/doinst.sh b/source/nut/install/doinst.sh
index d940ea66..8b225204 100644
--- a/source/nut/install/doinst.sh
+++ b/source/nut/install/doinst.sh
@@ -17,7 +17,7 @@ chmod +0755 $DOCROOT/scripts/* \
         /usr/sbin/nut-notify
 
 # copy the default
-cp -nr $DOCROOT/default.cfg $BOOT/nut.cfg
+cp -nr $DOCROOT/default.cfg $BOOT/nut.cfg >/dev/null 2>&1
 
 # remove nut symlink
 if [ -L /etc/nut ]; then
@@ -31,10 +31,10 @@ if [ ! -d $BOOT/ups ]; then
 fi
 
 # copy default conf files to flash drive, if no backups exist there
-cp -nr $DOCROOT/nut/* $BOOT/ups
+cp -nr $DOCROOT/nut/* $BOOT/ups >/dev/null 2>&1
 
 # copy conf files from flash drive to local system, for our services to use
-cp -f $BOOT/ups/* /etc/nut
+cp -f $BOOT/ups/* /etc/nut >/dev/null 2>&1
 
 # update permissions
 if [ -d /etc/nut ]; then

From b3f9ae3539dac796d25c0a9cdfaa3f2456d475eb Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Tue, 25 Jul 2023 13:55:08 +0200
Subject: [PATCH 02/15] add save diagnostics function

add function so user is easily able to save their UPS details into a dummy-ups compliant .dev file, which the plugin developers can then request from the user to better identify problems with certain devices and the plugin itself.
---
 .../nut/usr/local/emhttp/plugins/nut/NUTdetails.page |  2 ++
 .../local/emhttp/plugins/nut/include/nut_status.php  | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/source/nut/usr/local/emhttp/plugins/nut/NUTdetails.page b/source/nut/usr/local/emhttp/plugins/nut/NUTdetails.page
index 158f3ac9..53f8ca64 100644
--- a/source/nut/usr/local/emhttp/plugins/nut/NUTdetails.page
+++ b/source/nut/usr/local/emhttp/plugins/nut/NUTdetails.page
@@ -32,6 +32,8 @@ table.tablesorter tbody tr:nth-child(even) {
 <tbody id="nut_status"><tr><td colspan="4" style="text-align:center"><i class="fa fa-spinner fa-spin icon"></i><em>Please wait, retrieving UPS information...</em></td></tr></tbody>
 </table>
 
+<div style="font-size:x-small;font-weight:bold;"><a href="/plugins/nut/include/nut_status.php?diagsave=true&all=true">Save Diagnostics</a></div>
+
 <script>
 function getNUTstatus() {
   $.get('/plugins/nut/include/nut_status.php',{all:'true'},function(data) {
diff --git a/source/nut/usr/local/emhttp/plugins/nut/include/nut_status.php b/source/nut/usr/local/emhttp/plugins/nut/include/nut_status.php
index ddf51b04..6d9bb2cd 100755
--- a/source/nut/usr/local/emhttp/plugins/nut/include/nut_status.php
+++ b/source/nut/usr/local/emhttp/plugins/nut/include/nut_status.php
@@ -29,6 +29,18 @@
 
 if (file_exists('/var/run/nut/upsmon.pid')) {
   exec("/usr/bin/upsc ".escapeshellarg($nut_name)."@$nut_ip 2>/dev/null", $rows);
+
+  if ($_GET['diagsave'] == "true") {
+
+  $diagstring = implode("\n",$rows);
+  header('Content-Disposition: attachment; filename="nut-diagnostics.dev"');
+  header('Content-Type: text/plain');
+  header('Content-Length: ' . strlen($diagstring));
+  header('Connection: close');
+  die($diagstring);
+
+  }
+
   for ($i=0; $i<count($rows); $i++) {
     $row = array_map('trim', explode(':', $rows[$i], 2));
     $key = $row[0];

From 46bc113c53787c010e8e7fbe3b59b5094ba3e829 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Tue, 25 Jul 2023 16:41:03 +0200
Subject: [PATCH 03/15] fix locked files when upgrading live system

stop the services before upgrading on a live system to remove any remaining file locks preventing files from getting patched in the running instance (before any reboots).
---
 plugin/nut-2.8.0.plg | 4 ++++
 plugin/nut.plg       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/plugin/nut-2.8.0.plg b/plugin/nut-2.8.0.plg
index adbffc89..fb7fe591 100644
--- a/plugin/nut-2.8.0.plg
+++ b/plugin/nut-2.8.0.plg
@@ -272,6 +272,10 @@ else
         ln -s /var/run/upsmon.pid /var/run/nut/upsmon.pid
     fi
 
+    # if upgrading on live system, stop the services here
+    # to release any remaining file locks before patching
+    [ -x /etc/rc.d/rc.nut ] && /etc/rc.d/rc.nut stop 2>/dev/null
+
     # upgrade plugin package
     upgradepkg --install-new &plgPATH;/&plgNAME;.txz
 
diff --git a/plugin/nut.plg b/plugin/nut.plg
index ac12dc09..08c7d953 100755
--- a/plugin/nut.plg
+++ b/plugin/nut.plg
@@ -247,6 +247,10 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
     rm &plgPATH;/&plgNAME;.md5
     exit 1
 else
+    # if upgrading on live system, stop the services here
+    # to release any remaining file locks before patching
+    [ -x /etc/rc.d/rc.nut ] && /etc/rc.d/rc.nut stop 2>/dev/null
+
     # upgrade plugin package
     upgradepkg --install-new &plgPATH;/&plgNAME;.txz
 

From 9aeb27d67a7db39dacfa1ccf14414c78c262ff31 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 04:11:28 +0200
Subject: [PATCH 04/15] privacy improvement to diagnostics

---
 .../local/emhttp/plugins/nut/include/nut_status.php    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/source/nut/usr/local/emhttp/plugins/nut/include/nut_status.php b/source/nut/usr/local/emhttp/plugins/nut/include/nut_status.php
index 6d9bb2cd..4f709c4d 100755
--- a/source/nut/usr/local/emhttp/plugins/nut/include/nut_status.php
+++ b/source/nut/usr/local/emhttp/plugins/nut/include/nut_status.php
@@ -32,7 +32,15 @@
 
   if ($_GET['diagsave'] == "true") {
 
-  $diagstring = implode("\n",$rows);
+  $diagarray = $rows;
+  
+  array_walk($diagarray, function(&$var) {
+    if (preg_match('/^(device|ups)\.(serial|macaddr):/i', $var, $matches)) {
+      $var = $matches[1] . '.' . $matches[2] . ': REMOVED';
+    }
+  });
+
+  $diagstring = implode("\n",$diagarray);
   header('Content-Disposition: attachment; filename="nut-diagnostics.dev"');
   header('Content-Type: text/plain');
   header('Content-Length: ' . strlen($diagstring));

From 1e915136d2fe4a6329593fb0b4da128298068530 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 10:47:31 +0200
Subject: [PATCH 05/15] 2.8.0 avoid file locks on upgrade

---
 plugin/nut-2.8.0.plg | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugin/nut-2.8.0.plg b/plugin/nut-2.8.0.plg
index fb7fe591..b98c4b90 100644
--- a/plugin/nut-2.8.0.plg
+++ b/plugin/nut-2.8.0.plg
@@ -253,6 +253,10 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
     rm &plgPATH;/&plgNAME;.md5
     exit 1
 else
+    # if upgrading on live system, stop the services here
+    # to release any remaining file locks before patching
+    [ -x /etc/rc.d/rc.nut ] && /etc/rc.d/rc.nut stop 2>/dev/null
+
     # nut-2.7.4 and nut plugin expects:
     #   Config: /etc/nut
     #   Pid   : /var/run/nut/upsmon.pid
@@ -264,7 +268,7 @@ else
     if [ ! -d /etc/nut ]; then
         # Link nut-2.8.0 config to nut-2.7.4 config
         mkdir /etc/nut
-        cp /etc/ups/* /etc/nut
+        cp -f /etc/ups/* /etc/nut
         rm -rf /etc/ups
         ln -s /etc/nut /etc/ups
         # Link nut-2.7.4 pid to nut-2.8.0 pid
@@ -272,10 +276,6 @@ else
         ln -s /var/run/upsmon.pid /var/run/nut/upsmon.pid
     fi
 
-    # if upgrading on live system, stop the services here
-    # to release any remaining file locks before patching
-    [ -x /etc/rc.d/rc.nut ] && /etc/rc.d/rc.nut stop 2>/dev/null
-
     # upgrade plugin package
     upgradepkg --install-new &plgPATH;/&plgNAME;.txz
 
@@ -331,7 +331,7 @@ rm -f &plgPATH;/*.txz \
 
 # Remove links for nut-2.8.0 vs nut-2.7.4
 rm -rf /etc/nut
-rm /etc/ups
+rm -f /etc/ups
 rm -rf /var/run/nut
 
 echo ""

From adf87ecb607358ebba053618f50c99dd503290df Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 10:52:54 +0200
Subject: [PATCH 06/15] 2.8.0 avoid old installation remnants on upgrade

---
 plugin/nut-2.8.0.plg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/nut-2.8.0.plg b/plugin/nut-2.8.0.plg
index b98c4b90..9de705d4 100644
--- a/plugin/nut-2.8.0.plg
+++ b/plugin/nut-2.8.0.plg
@@ -270,10 +270,10 @@ else
         mkdir /etc/nut
         cp -f /etc/ups/* /etc/nut
         rm -rf /etc/ups
-        ln -s /etc/nut /etc/ups
+        ln -sf /etc/nut /etc/ups
         # Link nut-2.7.4 pid to nut-2.8.0 pid
         mkdir /var/run/nut
-        ln -s /var/run/upsmon.pid /var/run/nut/upsmon.pid
+        ln -sf /var/run/upsmon.pid /var/run/nut/upsmon.pid
     fi
 
     # upgrade plugin package

From 2e36422c43d5fefa69549cfc45e4fa538a443779 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 11:21:11 +0200
Subject: [PATCH 07/15] more avoiding file-locks on upgrade

---
 plugin/nut-2.8.0.plg | 4 ++--
 plugin/nut.plg       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin/nut-2.8.0.plg b/plugin/nut-2.8.0.plg
index 9de705d4..1922c78d 100644
--- a/plugin/nut-2.8.0.plg
+++ b/plugin/nut-2.8.0.plg
@@ -249,8 +249,8 @@ sum1=$(/usr/bin/md5sum &plgPATH;/&plgNAME;.txz)
 sum2=$(/usr/bin/cat &plgPATH;/&plgNAME;.md5)
 if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
     echo "Wrong 'plugin' package md5 hash."
-    rm &plgPATH;/&plgNAME;.txz
-    rm &plgPATH;/&plgNAME;.md5
+    rm -f &plgPATH;/&plgNAME;.txz
+    rm -f &plgPATH;/&plgNAME;.md5
     exit 1
 else
     # if upgrading on live system, stop the services here
diff --git a/plugin/nut.plg b/plugin/nut.plg
index 08c7d953..7bbf795c 100755
--- a/plugin/nut.plg
+++ b/plugin/nut.plg
@@ -243,8 +243,8 @@ sum1=$(/usr/bin/md5sum &plgPATH;/&plgNAME;.txz)
 sum2=$(/usr/bin/cat &plgPATH;/&plgNAME;.md5)
 if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
     echo "Wrong 'plugin' package md5 hash."
-    rm &plgPATH;/&plgNAME;.txz
-    rm &plgPATH;/&plgNAME;.md5
+    rm -f &plgPATH;/&plgNAME;.txz
+    rm -f &plgPATH;/&plgNAME;.md5
     exit 1
 else
     # if upgrading on live system, stop the services here

From 84bae4a2230c19df532e1b3dcf645ab9f25e525d Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 14:55:22 +0200
Subject: [PATCH 08/15] fix switching from 2.7.4 to 2.8.0 on live system
 breaking

---
 plugin/nut-2.8.0.plg | 4 ++++
 plugin/nut.plg       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/plugin/nut-2.8.0.plg b/plugin/nut-2.8.0.plg
index 1922c78d..3125d41f 100644
--- a/plugin/nut-2.8.0.plg
+++ b/plugin/nut-2.8.0.plg
@@ -334,6 +334,10 @@ rm -rf /etc/nut
 rm -f /etc/ups
 rm -rf /var/run/nut
 
+# clean up once more in case of reinstall on live system
+rm -rf /etc/nut
+rm -rf /etc/ups
+
 echo ""
 echo "-----------------------------------------------------------"
 echo " &name; has been removed."
diff --git a/plugin/nut.plg b/plugin/nut.plg
index 7bbf795c..1f226222 100755
--- a/plugin/nut.plg
+++ b/plugin/nut.plg
@@ -304,6 +304,10 @@ rm -rf &plgPATH;/ups
 rm -f &plgPATH;/*.txz \
     &plgPATH;/*.md5
 
+# clean up once more in case of reinstall on live system
+rm -rf /etc/nut
+rm -rf /etc/ups
+
 echo ""
 echo "-----------------------------------------------------------"
 echo " &name; has been removed."

From 435f278604c6af3ac0e158611187fa9d8ecaf7c9 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:00:13 +0200
Subject: [PATCH 09/15] clean up installation remnants for version
 transitioning

---
 plugin/nut-2.8.0.plg | 2 +-
 plugin/nut.plg       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugin/nut-2.8.0.plg b/plugin/nut-2.8.0.plg
index 3125d41f..08fbb72c 100644
--- a/plugin/nut-2.8.0.plg
+++ b/plugin/nut-2.8.0.plg
@@ -334,7 +334,7 @@ rm -rf /etc/nut
 rm -f /etc/ups
 rm -rf /var/run/nut
 
-# clean up once more in case of reinstall on live system
+# clean up once more in case of reinstall of other nut package on live system
 rm -rf /etc/nut
 rm -rf /etc/ups
 
diff --git a/plugin/nut.plg b/plugin/nut.plg
index 1f226222..d48f5d2d 100755
--- a/plugin/nut.plg
+++ b/plugin/nut.plg
@@ -304,9 +304,10 @@ rm -rf &plgPATH;/ups
 rm -f &plgPATH;/*.txz \
     &plgPATH;/*.md5
 
-# clean up once more in case of reinstall on live system
+# clean up once more in case of reinstall of other nut package on live system
 rm -rf /etc/nut
 rm -rf /etc/ups
+rm -rf /var/run/nut
 
 echo ""
 echo "-----------------------------------------------------------"

From 4f1e4c6987a3d0fdc5a58777df77bb0dd1684c7c Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:33:54 +0200
Subject: [PATCH 10/15] clean up folders before and after installation

fixes remnants of old installation breaking a re-install of the package
---
 plugin/nut-2.8.0.plg | 8 +++++++-
 plugin/nut.plg       | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/plugin/nut-2.8.0.plg b/plugin/nut-2.8.0.plg
index 08fbb72c..02c3afcc 100644
--- a/plugin/nut-2.8.0.plg
+++ b/plugin/nut-2.8.0.plg
@@ -244,6 +244,11 @@ if [[ ${version:0:3} == 6.0 ]]; then
     exit 1
 fi
 
+# start install always with fresh folders
+# in case of unclean old installation remnants
+rm -rf /etc/nut
+rm -rf /etc/ups
+
 # Verify and install plugin package
 sum1=$(/usr/bin/md5sum &plgPATH;/&plgNAME;.txz)
 sum2=$(/usr/bin/cat &plgPATH;/&plgNAME;.md5)
@@ -334,7 +339,8 @@ rm -rf /etc/nut
 rm -f /etc/ups
 rm -rf /var/run/nut
 
-# clean up once more in case of reinstall of other nut package on live system
+# clean up folders after the removed installation
+# in case of re-installation of package on live system
 rm -rf /etc/nut
 rm -rf /etc/ups
 
diff --git a/plugin/nut.plg b/plugin/nut.plg
index d48f5d2d..6526a2f9 100755
--- a/plugin/nut.plg
+++ b/plugin/nut.plg
@@ -238,6 +238,11 @@ if [[ ${version:0:3} == 6.0 ]]; then
     exit 1
 fi
 
+# start install always with fresh folders
+# in case of unclean old installation remnants
+rm -rf /etc/nut
+rm -rf /etc/ups
+
 # Verify and install plugin package
 sum1=$(/usr/bin/md5sum &plgPATH;/&plgNAME;.txz)
 sum2=$(/usr/bin/cat &plgPATH;/&plgNAME;.md5)
@@ -304,7 +309,8 @@ rm -rf &plgPATH;/ups
 rm -f &plgPATH;/*.txz \
     &plgPATH;/*.md5
 
-# clean up once more in case of reinstall of other nut package on live system
+# clean up folders after the removed installation
+# in case of re-installation of package on live system
 rm -rf /etc/nut
 rm -rf /etc/ups
 rm -rf /var/run/nut

From 3cdf57a4cdcd65dd736330e76eeed39bccd75574 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 16:13:02 +0200
Subject: [PATCH 11/15] fix && breaking xml

---
 plugin/nut-2.8.0.plg | 4 +++-
 plugin/nut.plg       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugin/nut-2.8.0.plg b/plugin/nut-2.8.0.plg
index 02c3afcc..aa7dad02 100644
--- a/plugin/nut-2.8.0.plg
+++ b/plugin/nut-2.8.0.plg
@@ -260,7 +260,9 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
 else
     # if upgrading on live system, stop the services here
     # to release any remaining file locks before patching
-    [ -x /etc/rc.d/rc.nut ] && /etc/rc.d/rc.nut stop 2>/dev/null
+    if [ -x /etc/rc.d/rc.nut ]; then
+        /etc/rc.d/rc.nut stop 2>/dev/null
+    fi
 
     # nut-2.7.4 and nut plugin expects:
     #   Config: /etc/nut
diff --git a/plugin/nut.plg b/plugin/nut.plg
index 6526a2f9..a7ab914e 100755
--- a/plugin/nut.plg
+++ b/plugin/nut.plg
@@ -254,7 +254,9 @@ if [ "${sum1:0:32}" != "${sum2:0:32}" ]; then
 else
     # if upgrading on live system, stop the services here
     # to release any remaining file locks before patching
-    [ -x /etc/rc.d/rc.nut ] && /etc/rc.d/rc.nut stop 2>/dev/null
+    if [ -x /etc/rc.d/rc.nut ]; then
+        /etc/rc.d/rc.nut stop 2>/dev/null
+    fi
 
     # upgrade plugin package
     upgradepkg --install-new &plgPATH;/&plgNAME;.txz

From fb0908db9c0b9cd8c3135de4dc50aa6852697682 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 16:22:07 +0200
Subject: [PATCH 12/15] better order of cleaning methods

---
 plugin/nut-2.8.0.plg |  9 ++++-----
 plugin/nut.plg       | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugin/nut-2.8.0.plg b/plugin/nut-2.8.0.plg
index aa7dad02..ae9e40ad 100644
--- a/plugin/nut-2.8.0.plg
+++ b/plugin/nut-2.8.0.plg
@@ -244,11 +244,6 @@ if [[ ${version:0:3} == 6.0 ]]; then
     exit 1
 fi
 
-# start install always with fresh folders
-# in case of unclean old installation remnants
-rm -rf /etc/nut
-rm -rf /etc/ups
-
 # Verify and install plugin package
 sum1=$(/usr/bin/md5sum &plgPATH;/&plgNAME;.txz)
 sum2=$(/usr/bin/cat &plgPATH;/&plgNAME;.md5)
@@ -264,6 +259,10 @@ else
         /etc/rc.d/rc.nut stop 2>/dev/null
     fi
 
+    # start install always with fresh folders
+    rm -rf /etc/nut
+    rm -rf /etc/ups
+
     # nut-2.7.4 and nut plugin expects:
     #   Config: /etc/nut
     #   Pid   : /var/run/nut/upsmon.pid
diff --git a/plugin/nut.plg b/plugin/nut.plg
index a7ab914e..67beee5e 100755
--- a/plugin/nut.plg
+++ b/plugin/nut.plg
@@ -238,11 +238,6 @@ if [[ ${version:0:3} == 6.0 ]]; then
     exit 1
 fi
 
-# start install always with fresh folders
-# in case of unclean old installation remnants
-rm -rf /etc/nut
-rm -rf /etc/ups
-
 # Verify and install plugin package
 sum1=$(/usr/bin/md5sum &plgPATH;/&plgNAME;.txz)
 sum2=$(/usr/bin/cat &plgPATH;/&plgNAME;.md5)
@@ -258,6 +253,11 @@ else
         /etc/rc.d/rc.nut stop 2>/dev/null
     fi
 
+    # start install always with fresh folders
+    rm -rf /etc/nut
+    rm -rf /etc/ups
+    mkdir /etc/nut
+
     # upgrade plugin package
     upgradepkg --install-new &plgPATH;/&plgNAME;.txz
 

From 0ea3e32736730b061a576775c9a246a9c54cd951 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 16:34:35 +0200
Subject: [PATCH 13/15] put mkdir elsewhere to keep things continous

---
 plugin/nut.plg               | 1 -
 source/nut/install/doinst.sh | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugin/nut.plg b/plugin/nut.plg
index 67beee5e..8615520a 100755
--- a/plugin/nut.plg
+++ b/plugin/nut.plg
@@ -256,7 +256,6 @@ else
     # start install always with fresh folders
     rm -rf /etc/nut
     rm -rf /etc/ups
-    mkdir /etc/nut
 
     # upgrade plugin package
     upgradepkg --install-new &plgPATH;/&plgNAME;.txz
diff --git a/source/nut/install/doinst.sh b/source/nut/install/doinst.sh
index 8b225204..de236a52 100644
--- a/source/nut/install/doinst.sh
+++ b/source/nut/install/doinst.sh
@@ -25,6 +25,11 @@ if [ -L /etc/nut ]; then
     mkdir /etc/nut
 fi
 
+# create nut directory
+if [ ! -d /etc/nut ]; then
+    mkdir /etc/nut
+fi
+
 # prepare conf backup directory on flash drive, if it does not already exist
 if [ ! -d $BOOT/ups ]; then
     mkdir $BOOT/ups

From 3491b318de33616a4d5dc9ea8b6dad18ba6328bf Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 16:55:31 +0200
Subject: [PATCH 14/15] don't clean folders before install, breaks things

---
 plugin/nut-2.8.0.plg | 11 +++++++----
 plugin/nut.plg       |  4 ----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugin/nut-2.8.0.plg b/plugin/nut-2.8.0.plg
index ae9e40ad..1e36ebef 100644
--- a/plugin/nut-2.8.0.plg
+++ b/plugin/nut-2.8.0.plg
@@ -36,6 +36,12 @@
 - add: implement battery replacement notification in settings
 
         Thanks to forum member Rysz for the PR.
+###2023.06.03
+- Add Small footer style thanks ich777 for the PR.
+###2023.02.14
+-6.12 Dashboard support
+-PHP8 fixes
+-Refresh option.
 ###2022.03.20
 -fix for filetree top level
 -update nut footer
@@ -259,10 +265,6 @@ else
         /etc/rc.d/rc.nut stop 2>/dev/null
     fi
 
-    # start install always with fresh folders
-    rm -rf /etc/nut
-    rm -rf /etc/ups
-
     # nut-2.7.4 and nut plugin expects:
     #   Config: /etc/nut
     #   Pid   : /var/run/nut/upsmon.pid
@@ -344,6 +346,7 @@ rm -rf /var/run/nut
 # in case of re-installation of package on live system
 rm -rf /etc/nut
 rm -rf /etc/ups
+rm -rf /var/run/nut
 
 echo ""
 echo "-----------------------------------------------------------"
diff --git a/plugin/nut.plg b/plugin/nut.plg
index 8615520a..5364a05b 100755
--- a/plugin/nut.plg
+++ b/plugin/nut.plg
@@ -253,10 +253,6 @@ else
         /etc/rc.d/rc.nut stop 2>/dev/null
     fi
 
-    # start install always with fresh folders
-    rm -rf /etc/nut
-    rm -rf /etc/ups
-
     # upgrade plugin package
     upgradepkg --install-new &plgPATH;/&plgNAME;.txz
 

From 6c4d6da2c5122b19869b6b938ae5c037b7d4838c Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Wed, 26 Jul 2023 17:19:29 +0200
Subject: [PATCH 15/15] fix 2.8.0 permissions issue

2.8.0 uses /var/state/ups instead of /var/run/nut folder, add permissioning for correct folder access
---
 source/nut/etc/rc.d/rc.nut | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/nut/etc/rc.d/rc.nut b/source/nut/etc/rc.d/rc.nut
index 86356311..c449e071 100755
--- a/source/nut/etc/rc.d/rc.nut
+++ b/source/nut/etc/rc.d/rc.nut
@@ -214,6 +214,8 @@ write_config() {
         chmod 640 /etc/nut/*
         chown root:nut /var/run/nut
         chmod 0770 /var/run/nut
+        chown root:nut /var/state/ups
+        chmod 0770 /var/state/ups
         #chown -R 218:218 /etc/nut
         #chmod -R 0644 /etc/nut
     fi