diff --git a/ranger/install.sh b/ranger/install.sh
index 45fc3d6..acd3c71 100755
--- a/ranger/install.sh
+++ b/ranger/install.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-
+set -e
 DIR=$(readlink -f "$(dirname "$0")")
 . "$DIR/../env.sh"
 
- install ranger
+# install ranger
 case "$PM" in
     apt)
         # atool/p7zip-full for archive previewing/extracting etc
@@ -13,8 +13,8 @@ case "$PM" in
         sudo pip3 install ranger-fm ueberzug
         ;;
     pacman)
-        sudo pacman -S --needed atool
-        sudo pip install ranger-fm ueberzug p7zip unrar highlight
+        sudo pacman -S --needed atool p7zip unrar highlight
+        sudo pip install ranger-fm ueberzug
         ;;
 esac
 
@@ -25,4 +25,5 @@ lnsf "$DIR/config/scope.sh" "$XDG_CONFIG_HOME/ranger/scope.sh"
 lnsf "$DIR/config/colorschemes/solarizedmod.py" "$XDG_CONFIG_HOME/ranger/colorschemes/solarizedmod.py"
 
 # install devicons
-git clone --depth 1 https://github.com/alexanderjeurissen/ranger_devicons ~/.config/ranger/plugins/ranger_devicons
+[ ! -d ~/.config/ranger/plugins/ranger_devicons ] && \
+    git clone --depth 1 https://github.com/alexanderjeurissen/ranger_devicons ~/.config/ranger/plugins/ranger_devicons