diff --git a/README.md b/README.md index 3fc14eb..b54a778 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Comfortable 3-finger (and 4-finger) swipe gestures for Ubuntu 14.04 LTS+ ## Installation -1. `sudo apt install libinput-tools libinput-dev libxdo-dev` +1. `sudo apt-get install git libinput-tools libxdo-dev` 2. `git clone https://github.com/Hikari9/comfortable-swipe-ubuntu.git` 3. `cd comfortable-swipe-ubuntu` 4. `bash install` @@ -49,5 +49,8 @@ up4 | 4-finger swipe up | super+d | show desktop down4 | 4-finger swipe down | super+d | show desktop threshold | mouse pixels to activate swipe; higher = less sensitive; integers only | 20 +## Uninstall +1. `bash uninstall` + ## Bug Reports Create an issue [here](https://github.com/Hikari9/comfortable-swipe-ubuntu/issues/new) to report a bug. diff --git a/install b/install index a504318..a44391a 100755 --- a/install +++ b/install @@ -8,11 +8,17 @@ if [ ! -f $CONF_PATH ]; then cat $DCONF_PATH > $CONF_PATH else # config file found, ask user if overwrite - echo "Previous conf file found in $CONF_PATH" - read -r -p "Do you want to overwrite? [Y/n] " response + echo "Old conf file found in $CONF_PATH" + read -r -p "Keep the old conf file? (default: yes) [Y/n] " response response=${response,,} # tolower - if [[ "$response" =~ ^(yes|y)$ ]]; then - cat $DCONF_PATH > $CONF_PATH + if [[ "$response" =~ ^(no|n)$ ]]; then + read -r -p "Conf file will be overwritten. Are you sure? [Y/n] " response + response=${response,,} + if [[ "$response" =~ ^(yes|y)$ ]]; then + cat $DCONF_PATH > $CONF_PATH + else + exec echo "Installation aborted." + fi fi fi echo "Installing..." diff --git a/uninstall b/uninstall new file mode 100644 index 0000000..958970c --- /dev/null +++ b/uninstall @@ -0,0 +1,6 @@ +#!/bin/bash +echo "Uninstalling..." +comfortable-swipe stop 2> /dev/null +rm /home/$USER/.local/bin/comfortable-swipe 2> /dev/null +sleep 1 +echo "Successfully uninstalled comfortable-swipe" \ No newline at end of file