Finishing touches

install/01-fish.sh

@@ -7,36 +7,33 @@
 #
 
 # 1. fish shell is installed
-if [ is_missing fish ] 2>/dev/null
-then
+if not_installed "fish"; then
 
     printf "Installing fish...\n"
 
     # Add fish repository
-    sudo apt-add-repository -y ppa:fish-shell/release-3
-    sudo apt-get -y update
+    app_ppa fish-shell/release-3
+    update
 
     # Install fish
-    sudo apt-get -y install fish
+    install fish
 
 fi
 printf "fish is installed\n"
+fish --version
 
 # 2. fish shell is default login shell
 readonly fish_path=$(which fish)
-if [ $SHELL != fish_path ]
-then
-
-    printf "Setting fish as default...\n"
+if [ "$SHELL" != fish_path ]; then
 
     # Update default login shell
-    usermod -s $fish_path $USER
+    usermod -s "$fish_path" "$USER"
 
 fi
 printf "fish is default login shell\n"
 
 # 3. fish dotfiles are symlinked
-readonly fish_source="$dotfiles_dir/fish/*"
+readonly fish_source="$dotfiles_dir/fish"
 readonly fish_target="$HOME/.config/fish"
 link_folder "$fish_source" "$fish_target"
 printf "fish dotfiles linked\n"