mirror of
https://github.com/jimeh/tmuxifier.git
synced 2026-02-19 01:46:40 +00:00
Make better use of conditional operators and quote vars properly
This commit is contained in:
2
init.sh
2
init.sh
@@ -10,7 +10,7 @@ export PATH="$TMUXIFIER/bin:$PATH"
|
|||||||
|
|
||||||
# If `tmuxifier` is available, and `$TMUXIFIER_NO_COMPLETE` is not set, then
|
# If `tmuxifier` is available, and `$TMUXIFIER_NO_COMPLETE` is not set, then
|
||||||
# load tmuxifier shell completion.
|
# load tmuxifier shell completion.
|
||||||
if [ ! -z $(command -v "tmuxifier") ] && [ -z "$TMUXIFIER_NO_COMPLETE" ]; then
|
if [ -n "$(command -v "tmuxifier")" ] && [ -z "$TMUXIFIER_NO_COMPLETE" ]; then
|
||||||
if [ -n "$BASH_VERSION" ]; then
|
if [ -n "$BASH_VERSION" ]; then
|
||||||
source "$TMUXIFIER/completion/tmuxifier.bash"
|
source "$TMUXIFIER/completion/tmuxifier.bash"
|
||||||
elif [ -n "$ZSH_VERSION" ]; then
|
elif [ -n "$ZSH_VERSION" ]; then
|
||||||
|
|||||||
@@ -13,14 +13,14 @@
|
|||||||
# - $2: (optional) Shell command to execute when window is created.
|
# - $2: (optional) Shell command to execute when window is created.
|
||||||
#
|
#
|
||||||
new_window() {
|
new_window() {
|
||||||
if [ ! -z "$1" ]; then
|
if [ -n "$1" ]; then
|
||||||
window="$1"
|
window="$1"
|
||||||
fi
|
fi
|
||||||
local command=()
|
local command=()
|
||||||
if [ ! -z "$2" ]; then
|
if [ -n "$2" ]; then
|
||||||
command+=("$2")
|
command+=("$2")
|
||||||
fi
|
fi
|
||||||
if [ ! -z "$window" ]; then
|
if [ -n "$window" ]; then
|
||||||
local winarg=(-n "$window")
|
local winarg=(-n "$window")
|
||||||
fi
|
fi
|
||||||
tmux new-window -t "$session:" "${winarg[@]}" "${command[@]}"
|
tmux new-window -t "$session:" "${winarg[@]}" "${command[@]}"
|
||||||
@@ -114,7 +114,7 @@ window_root() {
|
|||||||
# fi
|
# fi
|
||||||
#
|
#
|
||||||
initialize_session() {
|
initialize_session() {
|
||||||
if [ ! -z "$1" ]; then
|
if [ -n "$1" ]; then
|
||||||
session="$1"
|
session="$1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -127,7 +127,7 @@ initialize_session() {
|
|||||||
env TMUX= tmux new-session -d -s "$session"
|
env TMUX= tmux new-session -d -s "$session"
|
||||||
|
|
||||||
# Set default-path for session
|
# Set default-path for session
|
||||||
if [ ! -z "$session_root" ] && [ -d "$session_root" ]; then
|
if [ -n "$session_root" ] && [ -d "$session_root" ]; then
|
||||||
cd "$session_root"
|
cd "$session_root"
|
||||||
tmux set-option -t "$session" default-path "$session_root" 1>/dev/null
|
tmux set-option -t "$session" default-path "$session_root" 1>/dev/null
|
||||||
fi
|
fi
|
||||||
@@ -180,7 +180,7 @@ __expand_path() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
__go_to_session() {
|
__go_to_session() {
|
||||||
if [ -z $TMUX ]; then
|
if [ -z "$TMUX" ]; then
|
||||||
tmux -u attach-session -t "$session"
|
tmux -u attach-session -t "$session"
|
||||||
else
|
else
|
||||||
tmux -u switch-client -t "$session"
|
tmux -u switch-client -t "$session"
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ fi
|
|||||||
|
|
||||||
! command_path="$(tmuxifier-resolve-command-path "$command")"
|
! command_path="$(tmuxifier-resolve-command-path "$command")"
|
||||||
|
|
||||||
if [ ! -z "$command_path" ] && has-completions "$command_path"; then
|
if [ -n "$command_path" ] && has-completions "$command_path"; then
|
||||||
shift
|
shift
|
||||||
exec "$command_path" --complete "$@"
|
exec "$command_path" --complete "$@"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
set -e
|
set -e
|
||||||
[ -n "$TMUXIFIER_DEBUG" ] && set -x
|
[ -n "$TMUXIFIER_DEBUG" ] && set -x
|
||||||
|
|
||||||
if [ ! -z $TMUX ]; then
|
if [ -n "$TMUX" ]; then
|
||||||
for item in $(tmux list-sessions -F "#{?session_attached,1,0}:#S"); do
|
for item in $(tmux list-sessions -F "#{?session_attached,1,0}:#S"); do
|
||||||
if [[ "$item" == "1:"* ]]; then
|
if [[ "$item" == "1:"* ]]; then
|
||||||
echo ${item/1:/}
|
echo ${item/1:/}
|
||||||
|
|||||||
Reference in New Issue
Block a user