Merge branch 'master' of https://github.com/Hikari9/comfortable-swipe into improve-install

README.md

@@ -61,18 +61,18 @@ Comfortable, seamless, and fast 3-finger (and 4-finger) touchpad swipe gestures
    Comfortable swipe is RUNNING in the background
    ```
 
-1. (Optional) Toggle autostart
-
-   ```bash
-   comfortable-swipe autostart on
-   ```
-
 1. (Optional) Stop the Program
 
    ```
    comfortable-swipe stop
    ```
 
+1. (Optional) Toggle autostart
+
+   ```bash
+   comfortable-swipe autostart
+   ```
+
 1. (Optional) See program status
 
    ```bash
@@ -278,16 +278,6 @@ Refer to https://www.linux.org/threads/xdotool-keyboard.10528/ for a complete li
 - [KDE Keyboard Shortcuts](https://community.linuxmint.com/tutorial/view/47)
 - [PopOS Keyboard Shortcuts](https://support.system76.com/articles/pop-keyboard-shortcuts/)
 
-## Known Issues: Pop!_OS 20.04+
-
-Pop!_OS 20.04+ may be sensitive to capitalization  (#76, #82). Make sure to capitalize every first letter:
-
-```bash
-# Pop!_OS
-comfortable-swipe up3 = Super+Ctrl+Down
-comfortable-swipe down3 = Super+Ctrl+Up
-```
-
 ## Example Configurations
 
 This section includes some example configurations which you can use for your swipe experience.
@@ -316,8 +306,8 @@ This section includes some example configurations which you can use for your swi
 
    ```bash
    # Pop OS
-   comfortable-swipe up3 = Super+Ctrl+Down
+   comfortable-swipe up3 = ctrl+super+Down
-   comfortable-swipe down3 = Super+Ctrl+Up
+   comfortable-swipe down3 = ctrl+super+Up
    ```
 
 1. Move window to workspace (horizontal)

VERSION

@@ -1 +1 @@
-v1.2.5
+v1.2.4

install

@@ -2,11 +2,6 @@
 
 set -e
 
-if [[ "$USER" == root ]]; then
-    echo "Please run 'bash install' as non-root user" 2>&1
-    exit 1
-fi
-
 DIR="$(dirname "$0")"
 VERSION="$(cat $DIR/VERSION | tr -d '[:space:]')"
 
@@ -34,7 +29,7 @@ comfortable-swipe stop > /dev/null 2>&1 || true
 
 # shorthand to abort the installation
 function abort {
-    echo "Installation aborted" >&2 
+    echo "Installation aborted"
     exit 1
 }
 
@@ -67,23 +62,14 @@ function install_configuration_file {
         # ask user if we overwrite configuration
         echo "Old conf file found in $CONF_TARGET" >&2
         read -r -p "Keep the old conf file? (default: yes) [Y/n] " response >&2
-
+        if ! [[ "${response,,}" =~ ^(yes|y)$ ]]; then
-        # If response is empty, consider it as 'yes' (default)
-		if [[ -z "$response" ]]; then
-            response="y"
-        fi
-
-        if [[ "${response,,}" =~ ^(no|n)$ ]]; then
             # MAKE SURE they really want to overwrite
             read -r -p "Conf file will be overwritten! Are you sure? [Y/n] " response >&2
-			if [[ -z "$response" ]]; then
+            if [[ "${response,,}" =~ ^(yes|y)$ ]]; then
-				response="y"
-			fi
-        	if [[ "${response,,}" =~ ^(no|n)$ ]]; then
-                abort
-            else
                 # They agreed... replace configuration
                 cat "$CONF_SOURCE" > "$CONF_TARGET"
+            else
+                abort
             fi
         fi
     else