Refactored bootstrap install script.

Signed-off-by: kilo52 <[email protected]>

Author: kilo52

bootstrap/install.sh

@@ -276,33 +276,32 @@ function install_project_init() {
 #
 function uninstall_project_init() {
   local question="Are you sure that you want to UNINSTALL the Project Init system? (y/N): ";
-  if is_installed; then
-    # Ask for confirmation unless '--yes' option was specified
-    if [[ $ARG_ASSUME_YES == false ]]; then
-      if ! confirm_action "$question"; then
-        echo "Terminating...";
-        return 1;
-      fi
-    fi
-    # Check that file exists and can be removed
-    if ! [ -w "$FOUND_INSTALLATION" ]; then
-      echo "ERROR: Unable to remove installed file '${FOUND_INSTALLATION}'";
-      if [ -f "$FOUND_INSTALLATION" ]; then
-        echo "Do you have the necessary privileges?";
-      fi
+  if ! is_installed; then
+    echo "The Project Init system does not seem to be installed";
+    return 1;
+  fi
+  # Ask for confirmation unless '--yes' option was specified
+  if [[ $ARG_ASSUME_YES == false ]]; then
+    if ! confirm_action "$question"; then
+      echo "Terminating...";
       return 1;
     fi
-    # Remove installed file
-    if ! rm "$FOUND_INSTALLATION"; then
-      echo "ERROR: Failed to remove file '${FOUND_INSTALLATION}'";
-      return 1;
+  fi
+  # Check that file exists and can be removed
+  if ! [ -w "$FOUND_INSTALLATION" ]; then
+    echo "ERROR: Unable to remove installed file '${FOUND_INSTALLATION}'";
+    if [ -f "$FOUND_INSTALLATION" ]; then
+      echo "Do you have the necessary privileges?";
     fi
-    echo "Successfully uninstalled";
-    return 0;
-  else
-    echo "The Project Init system does not seem to be installed";
+    return 1;
   fi
-  return 1;
+  # Remove installed file
+  if ! rm "$FOUND_INSTALLATION"; then
+    echo "ERROR: Failed to remove file '${FOUND_INSTALLATION}'";
+    return 1;
+  fi
+  echo "Successfully uninstalled";
+  return 0;
 }
 
 function main() {