From d2c44c5903537b478900c30c8255fc9d64549b6e Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Fri, 24 Dec 2021 04:09:50 +0000 Subject: [PATCH] Shellcheck suggestions --- INSTALL.sh | 64 ++++++++++++++++---------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/INSTALL.sh b/INSTALL.sh index 7484d33..0b10323 100755 --- a/INSTALL.sh +++ b/INSTALL.sh @@ -3,12 +3,12 @@ install_links() { . ./DICT if [ -n "$FILES" ]; then - for i in `seq 1 $(echo "$FILES" | wc -w)`; do - file=$(echo "$FILES" | cut -d' ' -f $i) - loc=$(echo "$LOCATIONS" | cut -d' ' -f $i) - while [ 1 ]; do + for i in $(seq 1 "$(echo "$FILES" | wc -w)"); do + file=$(echo "$FILES" | cut -d' ' -f "$i") + loc=$(echo "$LOCATIONS" | cut -d' ' -f "$i") + while true; do CHOICE="overwrite" - if [ -a "$loc" ] && [ "$FORCE" = "0" ]; then + if [ -e "$loc" ] && [ "$FORCE" = "0" ]; then echo "WARNING: \"$loc\" exists, (overwrite, change, nothing): " read CHOICE fi @@ -19,10 +19,10 @@ ln -sf "$(pwd)/$file" "$loc"; break;; c|change) tmpfile=$(mktemp) - echo "$loc" >> $tmpfile + echo "$loc" >> "$tmpfile" $EDITOR "$tmpfile" - loc=$(cat $tmpfile) - rm $tmpfile + loc=$(cat "$tmpfile") + rm "$tmpfile" unset tmpfile;; n|nothing) break;; @@ -34,62 +34,62 @@ done fi if [ -n "$SUDO_FILES" ]; then - for i in `seq 1 $(echo "$SUDO_FILES" | wc -w)`; do - file=$(echo "$SUDO_FILES" | cut -d' ' -f $i) - loc=$(echo "$SUDO_LOCATIONS" | cut -d' ' -f $i) + for i in $(seq 1 "$(echo "$SUDO_FILES" | wc -w)"); do + file=$(echo "$SUDO_FILES" | cut -d' ' -f "$i") + loc=$(echo "$SUDO_LOCATIONS" | cut -d' ' -f "$i") dir=$(echo "$loc" | rev | cut -d'/' -f2- | rev) sudo mkdir -p "$dir" sudo ln -sf "$(pwd)/$file" "$loc" done fi - if [ "$(type -t custom)" = "function" ]; then - custom install + if type custom | grep -q "function" ; then + custom install fi } remove_links() { . ./DICT if [ -n "$FILES" ]; then - for i in `seq 1 $(echo $FILES | wc -w)`; do - loc=$(echo "$LOCATIONS" | cut -d' ' -f $i) + for i in $(seq 1 "$(echo "$FILES" | wc -w)"); do + loc=$(echo "$LOCATIONS" | cut -d' ' -f "$i") rm "$loc" 2>/dev/null - loc=$(echo "$loc" | rev | cut -d'/' -f2- | rev) - while [ -z "$(ls -A $loc)" ]; do + loc=$(dirname "$loc") + while [ -z "$(ls -A "$loc")" ]; do rm -r "$loc" - loc=$(echo "$loc" | rev | cut -d'/' -f2- | rev) + loc=$(dirname "$loc") done 2>/dev/null done fi if [ -n "$SUDO_FILES" ]; then - for i in `seq 1 $(echo $SUDO_FILES | wc -w)`; do - loc=$(echo "$SUDO_LOCATIONS" | cut -d' ' -f $i) + for i in $(seq 1 "$(echo "$SUDO_FILES" | wc -w)"); do + loc=$(echo "$SUDO_LOCATIONS" | cut -d' ' -f "$i") sudo rm "$loc" 2>/dev/null loc=$(echo "$loc" | rev | cut -d'/' -f2- | rev) - while [ -z "ls -A $loc" ]; do + while [ -z "$(ls -A "$loc")" ]; do sudo rm -r "$loc" loc=$(echo "$loc" | rev | cut -d'/' -f2- | rev) done 2>/dev/null done fi - if [ "$(type -t custom)" = "function" ]; then - custom remove + if type custom | grep -q "function"; then + custom remove fi } handle_package() { - echo $1 + echo "$1" if [ -d "$1" ]; then unset DEPS - eval $(grep "DEPS=" $1/DICT) - if [ "$INSTALL" = "1" ] || ([ "$INSTALL" = "0" ] && [ "$REMOVE_DEPS" = "1" ]); then + eval "$(grep "DEPS=" "$1/DICT")" + if ! [ "$INSTALL" = "0" ] && [ "$REMOVE_DEPS" = "0" ]; then for i in $DEPS; do if ! grep -q "$i" "$PACKAGE_CACHE"; then - (handle_package $i) + (handle_package "$i") fi done fi echo "$1" >> "$PACKAGE_CACHE" - (cd "$1"; "$([ \"$INSTALL\" = \"1\" ] && echo install || echo remove)_links") + (cd "$1" || exit; "$([ "$INSTALL" = "1" ] && echo install || echo remove)_links") else echo "No configuration found for $i" fi @@ -110,10 +110,10 @@ INSTALL=1 FORCE=0 REMOVE_DEPS=0 -PACKAGE_CACHE=$(mktemp) -DOTFILES_PATH="$(dirname $0)" +PACKAGE_CACHE="$(mktemp)" +DOTFILES_PATH="$(dirname "$0")" -cd $DOTFILES_PATH +cd "$DOTFILES_PATH" || exit if [ -z "$1" ]; then usage @@ -138,4 +138,4 @@ handle_package "$1" done -rm $PACKAGE_CACHE +rm "$PACKAGE_CACHE" -- Gitblit v1.9.3