Refactor the installer for Linux

Author: JacobDev1

misc/install.sh

@@ -1,36 +1,47 @@
 #!/bin/bash
+set -euo pipefail
 
 VERSION="0.9"
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-install(){
+perform_install(){
     # Remove older version
     if [ -d "/opt/xl-converter" ]; then
+        echo "Removing the previous installation from /opt/xl-converter"
         sudo rm -rf "/opt/xl-converter/"
         sleep 0.5       # Stops menu entry from disappearing until restart
     fi
 
-    # Desktop entries
-    cp -f "$SCRIPT_DIR/xl-converter.desktop" ~/Desktop/
-    sudo cp -f "$SCRIPT_DIR/xl-converter.desktop" /usr/share/applications/
-
     # Install
-    echo "Installing..."
-    sudo cp -rf "$SCRIPT_DIR/xl-converter" /opt/        # Copy program files
-    sudo chmod -R +rx /opt/xl-converter                 # Add permissions
-    
-    echo "Installation complete"
+    echo "Installing XL Converter to /opt/xl-converter"
+    sudo cp -rf "$SCRIPT_DIR/xl-converter" /opt/
+    sudo chmod -R +rx /opt/xl-converter
+
+    if command -v xdg-user-dir &> /dev/null; then
+        DESKTOP_DIR=$(xdg-user-dir DESKTOP)
+        if [ -d "$DESKTOP_DIR" ]; then
+            echo "Copying a .desktop file to $DESKTOP_DIR"
+            cp -f "$SCRIPT_DIR/xl-converter.desktop" "$DESKTOP_DIR/"
+        fi
+    fi
+
+    if [ -d "/usr/share/applications" ]; then
+        echo "Adding a menu entry to /usr/share/applications"
+        sudo cp -f "$SCRIPT_DIR/xl-converter.desktop" /usr/share/applications/
+    fi
+
+    echo "Installation complete."
 }
 
-check_root_permissions(){
+request_root_permissions(){
     # Check if sudo is installed
     if ! command -v sudo &> /dev/null; then
-        echo "Install sudo and try again"
+        echo "Install sudo and try again."
         exit 1
     fi
 
-    # Get root privileges (for copying files into /opt/)
-    if [ $EUID -ne 0 ]; then
+    # Request root privileges from user (for copying files into /opt/)
+    if [ "$EUID" -ne 0 ]; then
         sudo -v || { echo "Installation canceled, try again."; exit 1; }
     fi
 }
@@ -40,8 +51,6 @@ post_install(){
     if command -v update-desktop-database &> /dev/null; then
         sudo update-desktop-database /usr/share/applications/ &> /dev/null
     fi
-    
-    echo "You will find shortcuts in the start menu and on the desktop"
 }
 
 main(){
@@ -55,14 +64,24 @@ main(){
 
     echo -e "[2] Exit\n"
 
-    read -p "Choice: " choice
-
-    if [ "$choice" == "1" ]; then
-        check_root_permissions
-        install
-        post_install
-        exit 0
-    fi
+    while true; do
+        read -r -p "Choice: " choice
+        case "$choice" in 
+            1)
+                request_root_permissions
+                perform_install
+                post_install
+                exit 0
+                ;;
+            2)
+                echo "Exiting."
+                exit 0
+                ;;
+            *)
+                echo "Invalid option, try again."
+                ;;
+        esac
+    done
 }
 
 main