From 25069f487771575aa69f3f6a45fcb71a49906ee8 Mon Sep 17 00:00:00 2001
From: Bruno Tavares <bruno.exz@gmail.com>
Date: Wed, 20 May 2015 17:16:16 -0300
Subject: [PATCH] Lints the executable scripts

---
 bin/kickstart               | 24 ++++++++++++------------
 lib/kickstart-autocomplete  |  2 +-
 lib/kickstart-bootstrap     |  2 +-
 lib/kickstart-commands      |  4 ++--
 lib/kickstart-compile       | 18 +++++++++---------
 lib/kickstart-create        |  8 ++++----
 lib/kickstart-deploy        | 10 +++++-----
 lib/kickstart-doc           | 12 ++++++++----
 lib/kickstart-docker-create | 12 ++++++------
 lib/kickstart-docker-ssh    |  6 +++---
 lib/kickstart-infect        |  6 +++---
 lib/kickstart-local         |  2 +-
 lib/kickstart-root-dir      | 23 ++++++++++++-----------
 13 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/bin/kickstart b/bin/kickstart
index 698257b..1ab79a2 100755
--- a/bin/kickstart
+++ b/bin/kickstart
@@ -3,27 +3,27 @@ _kickstart_readlink() {
   (
   TARGET_FILE=$1
 
-  cd `dirname $TARGET_FILE`
-  TARGET_FILE=`basename $TARGET_FILE`
+  cd "$(dirname "$TARGET_FILE")"
+  TARGET_FILE=$(basename "$TARGET_FILE")
 
   while [ -L "$TARGET_FILE" ]
   do
-    TARGET_FILE=`readlink $TARGET_FILE`
-    cd `dirname $TARGET_FILE`
-    TARGET_FILE=`basename $TARGET_FILE`
+    TARGET_FILE=$(readlink "$TARGET_FILE")
+    cd "$(dirname "$TARGET_FILE")"
+    TARGET_FILE=$(basename "$TARGET_FILE")
   done
 
-  PHYS_DIR=`pwd -P`
+  PHYS_DIR=$(pwd -P)
   RESULT=$PHYS_DIR/$TARGET_FILE
-  echo $RESULT
+  echo "$RESULT"
   )
 }
 
-path_to_kickstart=`which kickstart`
-if [[ `uname` == "Darwin" ]]; then
-  curr_dir=$(dirname `_kickstart_readlink "$path_to_kickstart"`)
+path_to_kickstart=$(which kickstart)
+if [[ "$(uname)" == "Darwin" ]]; then
+  curr_dir=$(dirname "$(_kickstart_readlink "$path_to_kickstart")")
 else
-  curr_dir=$(dirname `readlink -f "$path_to_kickstart"`)
+  curr_dir=$(dirname "$(readlink -f "$path_to_kickstart")")
 fi
 
 command=${1:-help}
@@ -36,4 +36,4 @@ if ! [[ -x $command_file ]]; then
   exit 1
 fi
 
-exec $command_file "$@"
+exec "$command_file" "$@"
diff --git a/lib/kickstart-autocomplete b/lib/kickstart-autocomplete
index e0f0608..07d7234 100755
--- a/lib/kickstart-autocomplete
+++ b/lib/kickstart-autocomplete
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-root_dir=`kickstart root-dir`
+root_dir=$(kickstart root-dir)
 echo "source $root_dir/completions/kickstart"
diff --git a/lib/kickstart-bootstrap b/lib/kickstart-bootstrap
index 1dc9c0d..6d072dc 100755
--- a/lib/kickstart-bootstrap
+++ b/lib/kickstart-bootstrap
@@ -15,4 +15,4 @@ cat <<CMD
 CMD
 )
 
-tar chz -C `kickstart root-dir` . | ssh $target "$remote_command"
+tar chz -C "$(kickstart root-dir)" . | ssh "$target" "$remote_command"
diff --git a/lib/kickstart-commands b/lib/kickstart-commands
index b4c7d32..dc02245 100755
--- a/lib/kickstart-commands
+++ b/lib/kickstart-commands
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-root_dir=`kickstart root-dir`
-echo "`ls $root_dir/lib | cut -f2- -d'-'`"
+root_dir=$(kickstart root-dir)
+find "$root_dir"/lib -maxdepth | cut -f2- -d'-'
diff --git a/lib/kickstart-compile b/lib/kickstart-compile
index c40b487..964fb70 100755
--- a/lib/kickstart-compile
+++ b/lib/kickstart-compile
@@ -4,13 +4,13 @@ module_loading=$(cat <<MODULE
 current_dir=\$(pwd)
 cd modules/kickstart
 source install.sh
-cd \$current_dir
+cd "\$current_dir"
 
 for module in modules/*; do
-  if [ ! \$module = module/kickstart ]; then
-    cd \$module
+  if [ ! "\$module" = module/kickstart ]; then
+    cd "\$module"
     source install.sh
-    cd \$current_dir
+    cd "\$current_dir"
   fi
 done
 MODULE
@@ -22,24 +22,24 @@ clean_up_compile_folder() {
 }
 
 link_folder() {
-  [[ -h compile/$1 ]] || ln -s ../$1 compile/$1
+  [[ -h compile/"$1" ]] || ln -s ../"$1" compile/"$1"
 }
 
 link_modules() {
   mkdir -p compile/modules
 
-  ln -s `kickstart root-dir`/kickstart compile/modules/kickstart
+  ln -s "$(kickstart root-dir)"/kickstart compile/modules/kickstart
 
   if [ -d modules ]; then
     for module in modules/*; do
-      ln -s `pwd`/$module compile/$module
+      ln -s "$(pwd)"/"$module" compile/"$module"
     done
   fi
 }
 
 compile_install() {
   cat <( echo -e "$module_loading" ) install.sh > compile/install.sh
-  for role in $@; do
+  for role in "$@"; do
     echo "source roles/${role}.sh" >> compile/install.sh
   done
 }
@@ -49,5 +49,5 @@ link_folder files
 link_folder recipes
 link_folder roles
 link_modules
-compile_install $@
+compile_install "$@"
 echo -e "\necho Done" >> compile/install.sh
diff --git a/lib/kickstart-create b/lib/kickstart-create
index a9bb56f..c2a8c08 100755
--- a/lib/kickstart-create
+++ b/lib/kickstart-create
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 target=${1:-.}
 
-mkdir -p $target{,/roles,/recipes,/files}
-touch $target/{README.md,install.sh,roles/.gitkeep,recipes/.gitkeep,files/.gitkeep}
-chmod +x $target/install.sh
-[ -f $target/.gitignore ] && echo "compile" > $target/.gitignore || echo "compile" >> $target/.gitignore
+mkdir -p "$target"{,/roles,/recipes,/files}
+touch "$target"/{README.md,install.sh,roles/.gitkeep,recipes/.gitkeep,files/.gitkeep}
+chmod +x "$target"/install.sh
+echo "compile" >> "$target"/.gitignore
diff --git a/lib/kickstart-deploy b/lib/kickstart-deploy
index 22a6658..d14f126 100755
--- a/lib/kickstart-deploy
+++ b/lib/kickstart-deploy
@@ -12,13 +12,13 @@ shift
 remote_command=$(
 cat <<CMD
   target=\$(mktemp -d -t kickstart.XXXXX)
-  mkdir -p \$target
-  cd \$target
+  mkdir -p "\$target"
+  cd "\$target"
   tar xz
   $prefix bash $debug install.sh
-  rm -rf \$target
+  rm -rf "\$target"
 CMD
 )
 
-kickstart compile $@
-tar chz -C compile . | ssh $target "$remote_command"
+kickstart compile "$@"
+tar chz -C compile . | ssh "$target" "$remote_command"
diff --git a/lib/kickstart-doc b/lib/kickstart-doc
index 7eef3ee..be9156c 100755
--- a/lib/kickstart-doc
+++ b/lib/kickstart-doc
@@ -1,12 +1,16 @@
 #!/bin/bash
 
 list() {
-  root_dir=`kickstart root-dir`
-  find $root_dir/docs -type f | sed -e 's/.md$//' | cut -c `wc -c <<<$root_dir/docs/`- | tr '/' '.'
+  root_dir=$(kickstart root-dir)
+  find "$root_dir"/docs -type f | sed -e 's/.md$//' | cut -c "$(wc -c <<<$root_dir/docs/)"- | tr '/' '.'
 }
 
 show() {
-  cat `kickstart root-dir`/docs/$(echo $1 | tr '.' '/').md
+  cat "$(kickstart root-dir)"/docs/"$(echo "$1" | tr '.' '/')".md
 }
 
-[ -z "$1" ] && list || show $1
+if [ -z "$1" ]; then
+  list
+else
+  show "$1"
+fi
diff --git a/lib/kickstart-docker-create b/lib/kickstart-docker-create
index f2bf1a1..b43fdfd 100755
--- a/lib/kickstart-docker-create
+++ b/lib/kickstart-docker-create
@@ -4,24 +4,24 @@ image_name=${1:-$KICKSTART_DOCKER_IMAGE}
 image_name=${image_name:-moul/sshd}
 
 pull_sshd_image() {
-  docker pull $image_name
+  docker pull "$image_name"
 }
 
 remove_running_sshd() {
-  runnig_sshd=$(docker ps -q $image_name)
+  runnig_sshd=$(docker ps -q "$image_name")
   [ "$runnig_sshd" ] && docker kill "$runnig_sshd" && docker rm "$runnig_sshd"
   true
 }
 
 run_sshd() {
-  id=$(docker run -p 22 -d $image_name)
+  id=$(docker run -p 22 -d "$image_name")
 
   [ -z "$id" ] && echo "Docker container did't start" && return 1
 
-  echo "Connect using root:root on " `docker port $id 22`
-  port=`docker port $id 22 | cut -f 2 -d :`
+  echo "Connect using root:root on " "$(docker port "$id" 22)"
+  port=$(docker port "$id" 22 | cut -f 2 -d :)
   echo For ssh: kickstart docker-ssh
-  echo For deploy: kickstart deploy \"-p $port root@localhost\" '[roles]'
+  echo For deploy: kickstart deploy \"-p "$port" root@localhost\" '[roles]'
 }
 
 pull_sshd_image
diff --git a/lib/kickstart-docker-ssh b/lib/kickstart-docker-ssh
index 87da058..c0d4af9 100755
--- a/lib/kickstart-docker-ssh
+++ b/lib/kickstart-docker-ssh
@@ -3,8 +3,8 @@
 image_name=${1:-$KICKSTART_DOCKER_IMAGE}
 image_name=${image_name:-moul/sshd}
 
-runnig_sshd=$(docker ps -q $image_name)
+runnig_sshd=$(docker ps -q "$image_name")
 [ -z "$runnig_sshd" ] && echo "Docker container not created. Run \`kickstart docker-create\` to get one" && exit 1
 
-port=`docker port $runnig_sshd 22 | cut -f 2 -d :`
-exec ssh -p $port root@localhost
+port=$(docker port "$runnig_sshd" 22 | cut -f 2 -d :)
+exec ssh -p "$port" root@localhost
diff --git a/lib/kickstart-infect b/lib/kickstart-infect
index 14a90ae..b4c39f7 100755
--- a/lib/kickstart-infect
+++ b/lib/kickstart-infect
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 cat <<EVAL
-  current_dir=`pwd`
-  cd `kickstart root-dir`/kickstart/
+  current_dir=$(pwd)
+  cd $(kickstart root-dir)/kickstart/
   source install.sh
-  cd \$current_dir
+  cd "\$current_dir"
 EVAL
diff --git a/lib/kickstart-local b/lib/kickstart-local
index cd4fa79..1d48fa9 100755
--- a/lib/kickstart-local
+++ b/lib/kickstart-local
@@ -3,7 +3,7 @@
 [[ "$1" == "--sudo" ]] && prefix="sudo " && shift
 [ "$DEBUG" ] && debug="-x"
 
-kickstart compile $@
+kickstart compile "$@"
 (
 cd compile
 $prefix bash $debug install.sh
diff --git a/lib/kickstart-root-dir b/lib/kickstart-root-dir
index d7372db..3304387 100755
--- a/lib/kickstart-root-dir
+++ b/lib/kickstart-root-dir
@@ -4,26 +4,27 @@ _kickstart_readlink() {
   (
   TARGET_FILE=$1
 
-  cd `dirname $TARGET_FILE`
-  TARGET_FILE=`basename $TARGET_FILE`
+  cd "$(dirname "$TARGET_FILE")"
+  TARGET_FILE=$(basename "$TARGET_FILE")
 
   while [ -L "$TARGET_FILE" ]
   do
-    TARGET_FILE=`readlink $TARGET_FILE`
-    cd `dirname $TARGET_FILE`
-    TARGET_FILE=`basename $TARGET_FILE`
+    TARGET_FILE=$(readlink "$TARGET_FILE")
+    cd "$(dirname "$TARGET_FILE")"
+    TARGET_FILE=$(basename "$TARGET_FILE")
   done
 
-  PHYS_DIR=`pwd -P`
+  PHYS_DIR=$(pwd -P)
   RESULT=$PHYS_DIR/$TARGET_FILE
-  echo $RESULT
+  echo "$RESULT"
   )
 }
 
-path_to_kickstart=`which kickstart`
-if [[ `uname` == "Darwin" ]]; then
-  dirname $(dirname `_kickstart_readlink "$path_to_kickstart"`)
+path_to_kickstart=$(which kickstart)
+if [[ $(uname) == "Darwin" ]]; then
+  resolved_path_to_kickstart_bin=$(_kickstart_readlink "$path_to_kickstart")
 else
-  dirname $(dirname `readlink -f "$path_to_kickstart"`)
+  resolved_path_to_kickstart_bin=$(readlink -f "$path_to_kickstart")
 fi
+dirname "$(dirname "$resolved_path_to_kickstart_bin")"