Linting cleanup

.pre-commit-config.yaml

@@ -19,3 +19,6 @@ repos:
     rev: 2.1.5
     hooks:
       - id: shellcheck
+        # files: (.*\.sh$|^recipes/.*)
+        types: [shell, executable]
+        # files: ^recipes

recipes/default/abuse-the-force

@@ -1,12 +1,12 @@
 #! /bin/bash
 
-if [ ! -d $WORKSPACE/abuse-the-force ]; then
+if [ ! -d "$WORKSPACE/abuse-the-force" ]; then
-    git clone https://github.com/ViViDboarder/abuse-the-force.git $WORKSPACE/abuse-the-force
+    git clone https://github.com/ViViDboarder/abuse-the-force.git "$WORKSPACE/abuse-the-force"
 fi
 
-cd $WORKSPACE/abuse-the-force && git pull && rake install
+cd "$WORKSPACE/abuse-the-force" && git pull && rake install
 
 # Ensure this is in the user PATH
-for f in $DEFAULT_ASSETS_PATH/* ; do
+for f in "$DEFAULT_ASSETS_PATH"/* ; do
-    try_link "$f" "$USER_BIN/$(basename $f)"
+    try_link "$f" "$USER_BIN/$(basename "$f")"
 done

recipes/default/build-neovim

@@ -1,4 +1,5 @@
 #! /bin/bash
+set -e
 
 # in common
 # sudo_package 'libtool automake cmake'

recipes/default/force-cli

@@ -2,13 +2,13 @@
 
 # Some settings are mac specific
 if [[ "$UNAME_STR" == "Darwin" ]]; then
-    wget -P $USER_BIN https://godist.herokuapp.com/projects/heroku/force/releases/current/darwin-amd64/force
+    wget -P "$USER_BIN" https://godist.herokuapp.com/projects/heroku/force/releases/current/darwin-amd64/force
 elif [[ "$UNAME_STR" == "Linux" ]]; then
-    wget -P $USER_BIN https://godist.herokuapp.com/projects/heroku/force/releases/current/linux-amd64/force
+    wget -P "$USER_BIN" https://godist.herokuapp.com/projects/heroku/force/releases/current/linux-amd64/force
 fi
 
-chmod +x $USER_BIN/force
+chmod +x "$USER_BIN/force"
 
-for f in $DEFAULT_ASSETS_PATH/* ; do
+for f in "$DEFAULT_ASSETS_PATH"/* ; do
-    try_link "$f" "$USER_BIN/$(basename $f)"
+    try_link "$f" "$USER_BIN/$(basename "$f")"
 done

recipes/no-sudo/build-fish

@@ -2,13 +2,17 @@
 
 log "Compiling and installing fish-shell to local prefix"
 
-local fish_shell_dir=$WORKSPACE/fish-shell
+function main() {
+    local fish_shell_dir=$WORKSPACE/fish-shell
 
-if [ ! -d $fish_shell_dir ]; then
+    if [ ! -d "$fish_shell_dir" ]; then
         log "Cloning fish-shell"
-    git clone https://github.com/fish-shell/fish-shell $fish_shell_dir
+        git clone https://github.com/fish-shell/fish-shell "$fish_shell_dir"
-else
+    else
-    (cd $fish_shell_dir && git pull)
+        (cd "$fish_shell_dir" && git pull)
-fi
+    fi
 
-(cd $fish_shell_dir && ./configure --prefix=$LOCAL_PREFIX --disable-shared && make && make install)
+    (cd "$fish_shell_dir" && ./configure --prefix="$LOCAL_PREFIX" --disable-shared && make && make install)
+}
+
+main

recipes/no-sudo/build-vim

@@ -1,31 +1,34 @@
 #!/bin/bash
+set -e
 
-local vim_dir="$WORKSPACE/vim"
+function main() {
+    local vim_dir="$WORKSPACE/vim"
 
-# Build latest vim
+    # Build latest vim
-if [ ! -d $vim_dir ]; then
+    if [ ! -d "$vim_dir" ]; then
-    hg clone https://vim.googlecode.com/ $vim_dir
+        hg clone https://vim.googlecode.com/ "$vim_dir"
-fi
+    fi
 
-# Go to workspace
+    # Go to workspace
-cd $vim_dir
+    cd "$vim_dir"
 
-# Use latest tagged source code
+    # Use latest tagged source code
-hg update -r 'max(tagged())'
+    hg update -r 'max(tagged())'
-# Configure vim with ruby, python and GTK
+    # Configure vim with ruby, python and GTK
-./configure --with-features=huge \
+    ./configure --with-features=huge \
         --enable-pythoninterp \
         --enable-rubyinterp \
         --enable-gui=gtk2 \
-    --prefix=$LOCAL_PREFIX
+        --prefix="$LOCAL_PREFIX"
 
-# Compile
+    # Compile
-make
+    make
-# Install newly compiled vim
+    # Install newly compiled vim
-make install
+    make install
-# Link vi to vim out of convenience
+    # Link vi to vim out of convenience
-vim_path=$(which vim)
+    vim_path=$(which vim)
-sudo ln -s $vim_path ${vim_path:0:(-1)}
+    sudo ln -s "$vim_path" "${vim_path:0:(-1)}"
 
-# Go back to previous directory
+    # Go back to previous directory
-cd $ROOT_DIR
+    cd "$ROOT_DIR"
+}