From e1113a3f6c5013755e3b9fdf017de23676913eb8 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Sat, 27 Jul 2019 14:26:06 +0200 Subject: [PATCH] Fix tm script formatting --- .local/bin/tm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.local/bin/tm b/.local/bin/tm index 87b8646..afdeea8 100755 --- a/.local/bin/tm +++ b/.local/bin/tm @@ -3,7 +3,7 @@ # Attach to a tmux session, or create it if it doesnt exist if [ "$1" = '-h' ] || [ "$1" = '--help' ]; then -cat <<-EOF + cat <<-EOF Usage: $0 [FILE] [NAME] Attach to an existing tmux session, or bootstrap a new session. @@ -54,7 +54,7 @@ _not_in_tmux() { } _session_exists() { - if tmux has-session -t "$session_name" > /dev/null 2>&1; then + if tmux has-session -t "$session_name" >/dev/null 2>&1; then true else false @@ -67,13 +67,13 @@ _create_detached_session() { _load_env_session_file() { if [ -f ./.tmux.session ]; then - xargs -L1 tmux < ./.tmux.session + xargs -L1 tmux <./.tmux.session fi } _load_session_file() { if [ -f "$session_file" ]; then - xargs -L1 tmux < "$session_file" + xargs -L1 tmux <"$session_file" fi } @@ -92,7 +92,7 @@ _set_session_vars() { # set up session name and config file - if passed in as arguments if [ "$#" -eq 2 ]; then if ! _file_exists "$1" && ! _file_exists "${session_dir}${1}"; then - echo "$0: can not source configuration file: '${1}' does not exist." + echo >&2 "can not source session file: '${1}' does not exist." exit 1 fi _set_session_file_path "$1" @@ -106,12 +106,12 @@ _set_session_vars() { # set default session name if none was passed if [ -z "$session_name" ]; then - # only if we have a filename should we append it to the session name - if [ -n "$session_file" ]; then - fname=/$(basename "$session_file" .session) - fi - # default to parent directory name / config file name for the session - session_name=$(basename "$PWD" | sed 's/[^a-zA-Z0-9\-]//g' | tr . -)"$fname" + # only if we have a filename should we append it to the session name + if [ -n "$session_file" ]; then + fname=/$(basename "$session_file" .session) + fi + # default to parent directory name / config file name for the session + session_name=$(basename "$PWD" | sed 's/[^a-zA-Z0-9\-]//g' | tr . -)"$fname" fi }