chore: format files with shfmt and resolve most shellcheck complaints

test/lib/env.test.sh

@@ -11,21 +11,25 @@ TMUXIFER="/path/to/tmuxifier"
 
 # When TMUXIFIER_LAYOUT_PATH is not set.
 source "${root}/lib/env.sh"
+# shellcheck disable=SC2016
 assert 'echo $TMUXIFIER_LAYOUT_PATH' "${TMUXIFIER}/layouts"
 
 # When TMUXIFIER_LAYOUT_PATH is set and has a trailing slash.
 TMUXIFIER_LAYOUT_PATH="/path/to/layouts/"
 source "${root}/lib/env.sh"
+# shellcheck disable=SC2016
 assert 'echo $TMUXIFIER_LAYOUT_PATH' "/path/to/layouts"
 unset TMUXIFIER_LAYOUT_PATH
 
 # When TMUXIFIER_LAYOUT_PATH is set and does not have a trailing slash.
 TMUXIFIER_LAYOUT_PATH="/path/to/layouts"
 source "${root}/lib/env.sh"
+# shellcheck disable=SC2016
 assert 'echo $TMUXIFIER_LAYOUT_PATH' "/path/to/layouts"
 unset TMUXIFIER_LAYOUT_PATH
 
 # Tear down.
+# shellcheck disable=SC2034
 TMUXIFER="$realTMUXIFIER"
 unset realTMUXIFIER
 

test/lib/layout-helpers/__get_current_window_index.test.sh

@@ -7,25 +7,25 @@ source "${root}/lib/layout-helpers.sh"
 #
 
 # When current window is the first and only window.
-create-test-session
+create-test-session "test"
 assert "__get_current_window_index" "0"
-kill-test-session
+kill-test-session "test"
 
 # When creating a second window.
-create-test-session
+create-test-session "test"
 test-socket-tmux new-window -t "$session:1"
 assert "__get_current_window_index" "1"
-kill-test-session
+kill-test-session "test"
 
 # When creating a second window and then switching back to the first window.
-create-test-session
+create-test-session "test"
 test-socket-tmux new-window -t "$session:1"
 test-socket-tmux select-window -t "$session:0"
 assert "__get_current_window_index" "0"
-kill-test-session
+kill-test-session "test"
 
 # When creating multiples windows and switching between them randomly.
-create-test-session
+create-test-session "test"
 assert "__get_current_window_index" "0"
 test-socket-tmux new-window -t "$session:1"
 assert "__get_current_window_index" "1"
@@ -41,8 +41,7 @@ test-socket-tmux select-window -t "$session:3"
 assert "__get_current_window_index" "3"
 test-socket-tmux select-window -t "$session:2"
 assert "__get_current_window_index" "2"
-kill-test-session
-
+kill-test-session "test"
 
 # End of tests.
 assert_end "__get_current_window_index()"

test/lib/layout-helpers/__get_first_window_index.test.sh

@@ -7,24 +7,23 @@ source "${root}/lib/layout-helpers.sh"
 #
 
 # When first window has a index of 0.
-create-test-session
+create-test-session "test"
 assert "__get_first_window_index" "0"
-kill-test-session
+kill-test-session "test"
 
 # When first window has a index of 1.
-create-test-session
+create-test-session "test"
 test-socket-tmux new-window -t "$session:1"
 test-socket-tmux kill-window -t "$session:0"
 assert "__get_first_window_index" "1"
-kill-test-session
+kill-test-session "test"
 
 # When first window has a index of 2.
-create-test-session
+create-test-session "test"
 test-socket-tmux new-window -t "$session:2"
 test-socket-tmux kill-window -t "$session:0"
 assert "__get_first_window_index" "2"
-kill-test-session
-
+kill-test-session "test"
 
 # End of tests.
 assert_end "__get_first_window_index()"

test/lib/layout-helpers/__go_to_window_or_session_path.test.sh

@@ -12,7 +12,6 @@ __go_to_window_or_session_path
 assert "stub_called_times run_cmd" "0"
 restore run_cmd
 
-
 # When only $window_root is set, runs cd to $window_root path.
 stub run_cmd
 window_root="/tmp"
@@ -22,7 +21,6 @@ assert 'stub_called_with_times run_cmd clear' "1"
 unset window_root
 restore run_cmd
 
-
 # When only $TMUXIFIER_SESSION_ROOT is set, runs cd to $TMUXIFIER_SESSION_ROOT
 # path.
 stub run_cmd
@@ -33,7 +31,6 @@ assert 'stub_called_with_times run_cmd clear' "1"
 unset TMUXIFIER_SESSION_ROOT
 restore run_cmd
 
-
 # When only $session_root is set, runs cd to $session_root path.
 stub run_cmd
 session_root="/usr"
@@ -43,7 +40,6 @@ assert 'stub_called_with_times run_cmd clear' "1"
 unset session_root
 restore run_cmd
 
-
 # When $window_root and $session_root are set, runs cd to $window_root path.
 stub run_cmd
 window_root="/tmp"
@@ -55,7 +51,6 @@ unset window_root
 unset session_root
 restore run_cmd
 
-
 # When $TMUXIFIER_SESSION_ROOT and $session_root are set, runs cd to
 # $TMUXIFIER_SESSION_ROOT path.
 stub run_cmd
@@ -68,7 +63,6 @@ unset TMUXIFIER_SESSION_ROOT
 unset session_root
 restore run_cmd
 
-
 # When $window_root, $TMUXIFIER_SESSION_ROOT, and $session_root are set, runs
 # cd to $window_root path.
 stub run_cmd
@@ -83,6 +77,5 @@ unset TMUXIFIER_SESSION_ROOT
 unset session_root
 restore run_cmd
 
-
 # End of tests.
 assert_end "__go_to_window_or_session_path()"

test/lib/layout-helpers/new_window.test.sh

@@ -7,29 +7,29 @@ source "${root}/lib/layout-helpers.sh"
 #
 
 # When called without arguments, creates new window.
-create-test-session
+create-test-session "test"
 stub __go_to_window_or_session_path
 assert "test-socket-window-count" "1"
 new_window
 assert "test-socket-window-count" "2"
 assert "stub_called_times __go_to_window_or_session_path" "1"
 restore __go_to_window_or_session_path
-kill-test-session
+kill-test-session "test"
 
 # When called with name argument, creates new window with specified name.
-create-test-session
+create-test-session "test"
 stub __go_to_window_or_session_path
 assert "test-socket-window-count yippieezzz" "0"
 new_window "yippieezzz"
 assert "test-socket-window-count" "2"
 assert "test-socket-window-count yippieezzz" "1"
 restore __go_to_window_or_session_path
-kill-test-session
+kill-test-session "test"
 
 # When called with name and command argument, creates new window with
 # specified name and executes given command.
 rm "/tmp/tmuxifier-new_window-test" &> /dev/null
-create-test-session
+create-test-session "test"
 stub __go_to_window_or_session_path
 new_window "foobardoo" "touch /tmp/tmuxifier-new_window-test; bash"
 assert "test-socket-window-count" "2"
@@ -37,13 +37,13 @@ assert "test-socket-window-count foobardoo" "1"
 sleep 0.1 # attempt to avoid timing issue causing flicker
 assert_raises 'test -f "/tmp/tmuxifier-new_window-test"' 0
 restore __go_to_window_or_session_path
-kill-test-session
+kill-test-session "test"
 rm "/tmp/tmuxifier-new_window-test" &> /dev/null
 
 # When called ensure it sets the $window variable to the index of the newly
 # created window.
 unset window
-create-test-session
+create-test-session "test"
 stub __go_to_window_or_session_path
 new_window "foo"
 assert "echo $window" "1"
@@ -52,7 +52,7 @@ assert "echo $window" "2"
 new_window "bar"
 assert "echo $window" "3"
 restore __go_to_window_or_session_path
-kill-test-session
+kill-test-session "test"
 unset window
 
 # End of tests.

test/lib/layout-helpers/select_window.test.sh

@@ -8,11 +8,11 @@ source "${root}/lib/layout-helpers.sh"
 
 window_list() {
   test-socket-tmux list-windows -t "$session:" \
-    -F "#{window_active}:#{window_index}" 2>/dev/null
+    -F "#{window_active}:#{window_index}" 2> /dev/null
 }
 
 # Selects given window when passed a window index
-create-test-session
+create-test-session "test"
 test-socket-tmux new-window -t "$session:1"
 test-socket-tmux new-window -t "$session:2"
 select_window 0
@@ -21,23 +21,22 @@ select_window 1
 assert "window_list | grep '^1:'" "1:1"
 select_window 2
 assert "window_list | grep '^1:'" "1:2"
-kill-test-session
+kill-test-session "test"
 
 # Selects given window when passed a window name
-create-test-session
+create-test-session "test"
 test-socket-tmux new-window -t "$session:1" -n "foo"
 test-socket-tmux new-window -t "$session:2" -n "bar"
 select_window foo
 assert "window_list | grep '^1:'" "1:1"
 select_window bar
 assert "window_list | grep '^1:'" "1:2"
-kill-test-session
-
+kill-test-session "test"
 
 # When called ensure it sets the $window variable to the index of the newly
 # created window.
 unset window
-create-test-session
+create-test-session "test"
 test-socket-tmux new-window -t "$session:1" -n "foo"
 test-socket-tmux new-window -t "$session:2" -n "bar"
 select_window "foo"
@@ -48,7 +47,7 @@ select_window 1
 assert "echo $window" "1"
 select_window 2
 assert "echo $window" "2"
-kill-test-session
+kill-test-session "test"
 unset window
 
 # End of tests.

test/lib/runtime.test.sh

@@ -8,9 +8,11 @@ source "../test-helper.sh"
 source "${root}/lib/runtime.sh"
 
 # We assume env.sh has been sourced if $TMUXIFIER_LAYOUT_PATH has been set.
+# shellcheck disable=SC2016
 assert 'echo $TMUXIFIER_LAYOUT_PATH' "${TMUXIFIER}/layouts"
 
 # We ensure $session_root is set to $HOME by default.
+# shellcheck disable=SC2016
 assert 'echo $session_root' "$HOME"
 
 # We assume layout-helpers.sh has been sourced if a few of them are available.
@@ -18,6 +20,5 @@ for helper in new_window split_v split_h select_window select_pane; do
   assert "type $helper | head -1" "$helper is a function"
 done
 
-
 # End of tests.
 assert_end "runtime.sh"

test/lib/util.test.sh

@@ -34,7 +34,6 @@ assert_raises 'calling-help welcome-home' 1
 # End of tests.
 assert_end "calling-help()"
 
-
 #
 # calling-complete() tests.
 #

test/test-helper.sh

@@ -5,8 +5,9 @@ resolve_link() {
 }
 
 abs_dirname() {
-  local cwd="$(pwd)"
+  local cwd
   local path="$1"
+  cwd="$(pwd)"
 
   while [ -n "$path" ]; do
     cd "${path%/*}"
@@ -47,14 +48,13 @@ unset TMUXIFIER_NO_COMPLETE
 source "${testroot}/assert.sh"
 source "${testroot}/stub.sh"
 
-
 #
 # Test Helpers
 #
 
 test-socket-tmux() {
   export TMUXIFIER_TMUX_OPTS="-L tmuxifier-tests"
-  "$TMUX_BIN" $TMUXIFIER_TMUX_OPTS $@
+  "$TMUX_BIN" $TMUXIFIER_TMUX_OPTS "$@"
 }
 
 create-test-session() {
@@ -78,9 +78,10 @@ kill-test-server() {
 }
 
 test-socket-window-count() {
-  local list="$(test-socket-tmux list-windows)"
+  local list
+  list="$(test-socket-tmux list-windows)"
   if [ -n "$1" ]; then
-    echo "$list" | grep $1 | wc -l | awk '{print $1}'
+    echo "$list" | grep "$1" -c | awk '{print $1}'
   else
     echo "$list" | wc -l | awk '{print $1}'
   fi