revert changes

installation/includes/02_helpers.sh

@@ -56,24 +56,8 @@ check_os_type() {
   fi
 }
 
-set_optional_service_enablement() {
-    local service="$1"
-    local enablement="$2"
-    local option="${3:+$3 }" # optional, dont't quote in next call!
-
-    local local_sudo=
-    if [[ ! ${option} =~ "--user" ]]; then
-        local_sudo=sudo
-    fi
-
-    if (systemctl -all list-unit-files ${option}${service} | grep -w "${service}") ;then
-        ${local_sudo} systemctl ${option}${enablement} ${service}
-    fi
-}
-
-
 
-##### Test helpers
+##### Check helpers
 
 # Check if the file(s) exist
 verify_files_exist() {

installation/routines/optimize_boot_time.sh

@@ -12,28 +12,28 @@ OPTIMIZE_BOOT_CONF_HEADER="## Jukebox Boot Config"
 
 _optimize_disable_irrelevant_services() {
   echo "  * Disable keyboard-setup.service"
-  set_optional_service_enablement keyboard-setup.service disable
+  sudo systemctl disable keyboard-setup.service
 
   echo "  * Disable triggerhappy.service"
-  set_optional_service_enablement triggerhappy.service disable
-  set_optional_service_enablement triggerhappy.socket disable
+  sudo systemctl disable triggerhappy.service
+  sudo systemctl disable triggerhappy.socket
 
   echo "  * Disable raspi-config.service"
-  set_optional_service_enablement raspi-config.service disable
+  sudo systemctl disable raspi-config.service
 
   echo "  * Disable apt-daily.service & apt-daily-upgrade.service"
-  set_optional_service_enablement apt-daily.service disable
-  set_optional_service_enablement apt-daily-upgrade.service disable
-  set_optional_service_enablement apt-daily.timer disable
-  set_optional_service_enablement apt-daily-upgrade.timer disable
+  sudo systemctl disable apt-daily.service
+  sudo systemctl disable apt-daily-upgrade.service
+  sudo systemctl disable apt-daily.timer
+  sudo systemctl disable apt-daily-upgrade.timer
 }
 
 # TODO: If false, actually make sure bluetooth is enabled
 _optimize_handle_bluetooth() {
   if [ "$DISABLE_BLUETOOTH" = true ] ; then
     echo "  * Disable hciuart.service and bluetooth"
-    set_optional_service_enablement hciuart.service disable
-    set_optional_service_enablement bluetooth.service disable
+    sudo systemctl disable hciuart.service
+    sudo systemctl disable bluetooth.service
   fi
 }