better order of cleaning methods

SimonFair · Jul 26, 2023 · fb0908d · fb0908d
1 parent 3cdf57a
commit fb0908d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git 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
@@ -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