Merge branch 'master' into threeway_pacdiff

Author: Antiz96

admin/checkservices

@@ -311,15 +311,19 @@ main() {
     # from now, we need to be root
     (( UID != 0 )) && error 'You need to be root' && exit 1
 
-    # call pacdiff to ensure config files are updated before restart
+    # call pacdiff unless explicitly disabled to ensure config files are updated before restart
     if (( PACDIFF )); then
-        arrow 'Run pacdiff'
-	if (( THREEWAY )); then
-		pacdiff --threeway
-	else
-		pacdiff
-	fi
-    fi
+        if  command -v pacdiff &> /dev/null ; then
+            arrow 'Run pacdiff'
+            if (( THREEWAY )); then
+                pacdiff --threeway
+            else
+                pacdiff
+            fi
+        else
+            warn 'skipping pacdiff as not installed'
+        fi
+   fi
 
     # ensure systemd has been reloaded or reexectued
     (( RELOAD )) && reload_systemd
@@ -363,12 +367,6 @@ main() {
     fi
 }
 
-# disable pacdiff by default if not installed
-if  ! command -v pacdiff &> /dev/null ; then
-    warn 'skipping pacdiff as not installed'
-    PACDIFF=0
-fi
-
 main "$@"
 
 exit 0