Fix: handle legacy files in NO_SUDO mode (#133)

* Fix: handle legacy files in NO_SUDO mode

* Fix: handle legacy files in NO_SUDO mode

* Revert last two commits

* Fixed a bug where which 'fw-fanctrl' failed with set -e, causing the script to abort. Disabled set -e temporarily for this check and re-enabled it after execution

* Enhance uninstall and install functions to handle errors from pre-uninstall and post-install scripts, providing user guidance for permission issues.

* Refactor removal logic to use a save remove function.

---------

Co-authored-by: AhmedYasserrr <ahmdyasrj@gamil.com>

Author: AhmedYasserrr

install.sh

@@ -133,31 +133,48 @@ function sanitizePath() {
 
 function build() {
     echo "building package"
-    rm -rf "dist/" 2> "/dev/null" || true
+    remove_target "dist/"
     python -m build -s
     find . -type d -name "*.egg-info" -exec rm -rf {} + 2> "/dev/null" || true
 }
 
+# safe remove function
+function remove_target() {
+    local target="$1"
+    if [ -e "$target" ] || [ -L "$target" ]; then
+        if ! rm -rf "$target" 2> "/dev/null"; then
+            echo "Failed to remove: $target"
+            echo "Please run:"
+            echo "    sudo ./install.sh --remove"
+            exit 1
+        fi
+    fi
+}
+
 # remove remaining legacy files
 function uninstall_legacy() {
     echo "removing legacy files"
-    rm "/usr/local/bin/fw-fanctrl" 2> "/dev/null" || true
-    rm "/usr/local/bin/ectool" 2> "/dev/null" || true
-    rm "/usr/local/bin/fanctrl.py" 2> "/dev/null" || true
-    rm "/etc/systemd/system/fw-fanctrl.service" 2> "/dev/null" || true
-    rm "$DEST_DIR$PREFIX_DIR/bin/fw-fanctrl" 2> "/dev/null" || true
+    remove_target "/usr/local/bin/fw-fanctrl"
+    remove_target "/usr/local/bin/ectool"
+    remove_target "/usr/local/bin/fanctrl.py"
+    remove_target "/etc/systemd/system/fw-fanctrl.service"
+    remove_target "$DEST_DIR$PREFIX_DIR/bin/fw-fanctrl"
 }
 
 function uninstall() {
     if [ "$SHOULD_PRE_UNINSTALL" = true ]; then
-        ./pre-uninstall.sh "$([ "$NO_SUDO" = true ] && echo "--no-sudo")"
+        if ! ./pre-uninstall.sh "$([ "$NO_SUDO" = true ] && echo "--no-sudo")"; then
+            echo "Failed to run ./pre-uninstall.sh. Run the script with root permissions,"
+            echo "or skip this step by using the --no-pre-uninstall option."
+            exit 1
+        fi
     fi
     # remove program services based on the services present in the './services' folder
     echo "removing services"
     for SERVICE in $SERVICES ; do
         SERVICE=$(sanitizePath "$SERVICE")
         # be EXTRA CAREFUL about the validity of the paths (dont wanna delete something important, right?... O_O)
-        rm -rf "$DEST_DIR$PREFIX_DIR/lib/systemd/system/$SERVICE$SERVICE_EXTENSION"
+        remove_target "$DEST_DIR$PREFIX_DIR/lib/systemd/system/$SERVICE$SERVICE_EXTENSION"
     done
 
     # remove program services sub-configurations based on the sub-configurations present in the './services' folder
@@ -169,7 +186,7 @@ function uninstall() {
         for SUBCONFIG in $SUBCONFIGS ; do
             SUBCONFIG=$(sanitizePath "$SUBCONFIG")
             echo "removing '$DEST_DIR$PREFIX_DIR/lib/systemd/$SERVICE/$SUBCONFIG'"
-            rm -rf "$DEST_DIR$PREFIX_DIR/lib/systemd/$SERVICE/$SUBCONFIG" 2> "/dev/null" || true
+            remove_target "$DEST_DIR$PREFIX_DIR/lib/systemd/$SERVICE/$SUBCONFIG"
         done
     done
 
@@ -184,23 +201,23 @@ function uninstall() {
 
     ectool autofanctrl 2> "/dev/null" || true # restore default fan manager
     if [ "$SHOULD_INSTALL_ECTOOL" = true ]; then
-        rm "$DEST_DIR$PREFIX_DIR/bin/ectool" 2> "/dev/null" || true
+        remove_target "$DEST_DIR$PREFIX_DIR/bin/ectool"
     fi
-    rm -rf "$DEST_DIR$SYSCONF_DIR/fw-fanctrl" 2> "/dev/null" || true
-    rm -rf "/run/fw-fanctrl" 2> "/dev/null" || true
+    remove_target "$DEST_DIR$SYSCONF_DIR/fw-fanctrl" 
+    remove_target "/run/fw-fanctrl" 
 
     uninstall_legacy
 }
 
 function install() {
     uninstall_legacy
 
-    rm -rf "$TEMP_FOLDER"
+    remove_target "$TEMP_FOLDER"
     mkdir -p "$DEST_DIR$PREFIX_DIR/bin"
     if [ "$SHOULD_INSTALL_ECTOOL" = true ]; then
         mkdir "$TEMP_FOLDER"
         installEctool "$TEMP_FOLDER" || (echo "an error occurred when installing ectool." && echo "please check your internet connection or consider installing it manually and using --no-ectool on the installation script." && exit 1)
-        rm -rf "$TEMP_FOLDER"
+        remove_target "$TEMP_FOLDER"
     fi
     mkdir -p "$DEST_DIR$SYSCONF_DIR/fw-fanctrl"
 
@@ -215,7 +232,7 @@ function install() {
             pipx install --global --force dist/*.tar.gz
         fi
         which 'fw-fanctrl' 2> "/dev/null" || true
-        rm -rf "dist/" 2> "/dev/null" || true
+        remove_target "dist/"
     fi
 
     cp -pn "./src/fw_fanctrl/_resources/config.json" "$DEST_DIR$SYSCONF_DIR/fw-fanctrl" 2> "/dev/null" || true
@@ -263,7 +280,11 @@ function install() {
         done
     done
     if [ "$SHOULD_POST_INSTALL" = true ]; then
-        ./post-install.sh --dest-dir "$DEST_DIR" --sysconf-dir "$SYSCONF_DIR" "$([ "$NO_SUDO" = true ] && echo "--no-sudo")"
+        if ! ./post-install.sh --dest-dir "$DEST_DIR" --sysconf-dir "$SYSCONF_DIR" "$([ "$NO_SUDO" = true ] && echo "--no-sudo")"; then
+            echo "Failed to run ./post-install.sh. Run the script with root permissions,"
+            echo "or skip this step by using the --no-post-install option."
+            exit 1
+        fi
     fi
 }