8 Commits

Author SHA1 Message Date
3563c3d975 Bump version to 0.12.2 2016-04-02 22:28:37 +01:00
3bfbc50918 Merge pull request #70 from blueyed/fix-load-session
Fixes for load_session with file in current dir
2016-04-02 22:26:23 +01:00
Daniel Hahler
3a8a43ccdc style: load_session: move return case up, removing indent 2016-04-02 22:38:40 +02:00
Daniel Hahler
a9a87992df load_session: prefer existing session instead of file in cwd
This also adds './' to a file used from the current working dir (in case
there is no session with that name), which is required for Bash's
`source` to use it (and not look for it in `$PATH`).

Fixes https://github.com/jimeh/tmuxifier/issues/69.
2016-04-02 22:38:25 +02:00
5f4dd92d7f Merge pull request #66 from shalecraig/patch-1
Update link to iterm2
2016-01-26 23:09:54 +00:00
shale
bdaa272ca5 Update link to iterm2
iterm2 moved to gitlab from google project hosting.
2016-01-19 10:30:28 -08:00
dce4fb3ad2 Merge pull request #65 from bchretien/topic/window-rename
new_window: disable allow-rename if a window name was given
2015-12-20 23:38:43 +00:00
Benjamin Chrétien
6f8773133d new_window: disable allow-rename if a window name was given 2015-12-15 17:53:45 +01:00
3 changed files with 33 additions and 21 deletions

View File

@@ -216,7 +216,7 @@ example:
- Setting the `TMUXIFIER_TMUX_ITERM_ATTACH` environment variable to `-CC`
before calling the `load-session` command.
[tmux integration]: https://code.google.com/p/iterm2/wiki/TmuxIntegration
[tmux integration]: https://gitlab.com/gnachman/iterm2/wikis/TmuxIntegration
## Inspiration

View File

@@ -22,6 +22,10 @@ new_window() {
if [ -n "$2" ]; then local command=("$2"); fi
tmuxifier-tmux new-window -t "$session:" "${winarg[@]}" "${command[@]}"
# Disable renaming if a window name was given.
if [ -n "$1" ]; then tmuxifier-tmux set-option -t "$1" allow-rename off; fi
window="$(__get_current_window_index)"
__go_to_window_or_session_path
}
@@ -185,31 +189,39 @@ load_window() {
# - $2: (optional) Override default window name.
#
load_session() {
local file="$1"
if [ ! -f "$file" ]; then
file="$TMUXIFIER_LAYOUT_PATH/$1.session.sh"
fi
if [ -f "$file" ]; then
if [ $# -gt 1 ]; then
session="$2"
local file
if [ "${1#*/}" = "$1" ]; then
# There's no slash in the path.
if [ -f "$TMUXIFIER_LAYOUT_PATH/$1.session.sh" ] || [ ! -f "$1" ]; then
file="$TMUXIFIER_LAYOUT_PATH/$1.session.sh"
else
session="${1/%.session.sh}"
session="${session/%.sh}"
fi
set_default_path=true
source "$file"
session=
# Reset `$session_root`.
if [[ "$session_root" != "$HOME" ]]; then
session_root="$HOME"
# bash's 'source' requires an slash in the filename to not use $PATH.
file="./$1"
fi
else
file="$1"
fi
if ! [ -f "$file" ]; then
echo "\"$1\" session layout not found." >&2
return 1
fi
if [ $# -gt 1 ]; then
session="$2"
else
session="${1/%.session.sh}"
session="${session/%.sh}"
fi
set_default_path=true
source "$file"
session=
# Reset `$session_root`.
if [[ "$session_root" != "$HOME" ]]; then
session_root="$HOME"
fi
}
# Create a new session, returning 0 on success, 1 on failure.

View File

@@ -13,4 +13,4 @@ Outputs Tmuxifier version."
exit
fi
echo "0.12.1"
echo "0.12.2"