Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

only add -l when default_shell is bash #320

Closed
wants to merge 2 commits into from
Closed

only add -l when default_shell is bash #320

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6c706b
only add -l when default_shell is bash
tessus Dec 5, 2019
198f401
replace backticks, quote default-shell var (just in case)
tessus Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion scripts/restore.sh
View file
Open in desktop
Expand Up @@ -100,7 +100,11 @@ tmux_socket() {
# tmux server each time.
cache_tmux_default_command() {
local default_shell="$(get_tmux_option "default-shell" "")"
export TMUX_DEFAULT_COMMAND="$(get_tmux_option "default-command" "-l $default_shell")"
local opt=""
if [ "`basename $default_shell`"x == "bash"x ]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use $(basename $default_shell) instead of backticks? Btw. what's x at the end of the strings used for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use $(basename $default_shell) instead of backticks?

Sure.

Btw. what's x at the end of the strings used for?

It's an old habit to avoid test errors (unary operator issues), if one side is empty or undefined.
Theoretically default_shell should never be empty, also the double-quotes should prevent the error as well, but it all depends on the bash version and it doesn't hurt to be on the safe side.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want I can remove the x.

opt="-l "
fi
export TMUX_DEFAULT_COMMAND="$(get_tmux_option "default-command" "$opt$default_shell")"
}

tmux_default_command() {
Expand Down