Merge pull request #51 from ElianVanCutsem/master

Update README.md & set FreeBSD icons & install script function

README.md

@@ -11,11 +11,11 @@
 
 ## Install
 
-Usage:  `sudo ./install.sh`  **[OPTIONS...]**
+Usage:  `sudo ./install.sh [OPTIONS...]`
 
-*if no option used the terminal user interface will be show up*
+_if no option used the terminal user interface will be show up_
 
-|  OPTIONS:      | |
+|  OPTIONS:      | description |
 |:---------------|:-------------|
 | -v, --vimix    | Vimix grub theme |
 | -s, --stylish  | Stylish grub theme |
@@ -28,35 +28,37 @@ Usage:  `sudo ./install.sh`  **[OPTIONS...]**
 | -h, --help     | Show this help |
 
 For example:
-1. `Install Tela theme on 2k display device`
 
-    sudo ./install.sh -t -2
+1. Install Tela theme on 2k display device
 
-2. `Remove Tela theme`
+    `sudo ./install.sh -t -2`
+    or
+    `sudo ./install.sh --tela --2k`
 
-    sudo ./install.sh -r -t
+2. Remove Tela theme
+
+    `sudo ./install.sh -r -t`
 
 ## Display resolution issues
+
 #### Set the right resolution of your display
-On the grub screen, `press c` to get the commandline,
+
-and enter `vbeinfo` or `videoinfo` on EFI boot to check what resolutions you can use,
+On the grub screen, `press c` to get the commandline, and enter `vbeinfo` or `videoinfo` on EFI boot to check what resolutions you can use, then edit `/etc/default/grub` , add your resolution `GRUB_GFXMODE=****x****x32` into it, last you can run `grub-mkconfig -o /boot/grub/grub.cfg` to update your grub.cfg.
-then edit `/etc/default/grub` , add your resolution `GRUB_GFXMODE=****x****x32` into it,
-last you can run `grub-mkconfig -o /boot/grub/grub.cfg` to update your grub.cfg.
 
 ## Screenshots
 
 ### Vimix grub theme
 
-![01](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-vimix.jpg?raw=true)
+![vimix grub theme](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-vimix.jpg?raw=true "vimix grub theme")
 
 ### Stylish grub theme
 
-![02](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-stylish.jpg?raw=true)
+![Stylish grub theme](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-stylish.jpg?raw=true)
 
 ### Tela grub theme
 
-![03](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-tela.jpg?raw=true)
+![Tela grub theme](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-tela.jpg?raw=true)
 
 ### Slaze grub theme
 
-![04](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-slaze.jpg?raw=true)
+![Slaze grub theme](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-slaze.jpg?raw=true)

install.sh

@@ -154,8 +154,7 @@ install() {
         sudo -S <<< $REPLY $0 --${theme} --${screen}
       fi
     } || {
-      prompt  "\n Operation canceled  Bye"
+      operation_canceled
-      exit 1
     }
   fi
 }
@@ -173,7 +172,7 @@ run_dialog() {
         2) theme="tela"      ;;
         3) theme="stylish"   ;;
         4) theme="slaze"     ;;
-        *) prompt "Canceled" ;;
+        *) operation_canceled ;;
      esac
     tui=$(dialog --backtitle "GRUB2 THEMES" \
     --radiolist "Choose icon style : " 15 40 5 \
@@ -182,7 +181,7 @@ run_dialog() {
       case "$tui" in
         1) icon="white"      ;;
         2) icon="color"      ;;
-        *) prompt "Canceled" ;;
+        *) operation_canceled ;;
      esac
     tui=$(dialog --backtitle "GRUB2 THEMES" \
     --radiolist "Choose your Display Resolution : " 15 40 5 \
@@ -193,11 +192,17 @@ run_dialog() {
         1) screen="1080p"    ;;
         2) screen="2k"       ;;
         3) screen="4k"       ;;
-        *) prompt "Canceled" ;;
+        *) operation_canceled ;;
      esac
   fi
 }
 
+operation_canceled() {
+  clear
+  prompt  "\n Operation canceled by user Bye"
+  exit 1
+}
+
 install_dialog() {
   if [ ! "$(which dialog 2> /dev/null)" ]; then
     prompt -i "\n 'dialog' needs to be installed for this shell"
@@ -272,8 +277,7 @@ remove() {
         sudo -S <<< $REPLY $0 --remove --${theme}
       fi
     } || {
-      prompt  "\n Operation canceled  Bye"
+      operation_canceled
-      exit 1
     }
   fi
 }
@@ -292,8 +296,7 @@ if [[ $# -lt 1 ]] && [[ $UID -ne $ROOT_UID ]]; then
   [[ -n "$REPLY" ]]&& {
    exec sudo -S <<< $REPLY $0
   }|| {
-    prompt  "\n Operation canceled  Bye"
+    operation_canceled
-    exit 1
   }
 fi