jimeh/tmuxifier
1
0
Fork 0
mirror of https://github.com/jimeh/tmuxifier.git synced 2026-02-19 01:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70 from blueyed/fix-load-session

Browse Source 
Fixes for load_session with file in current dir
This commit is contained in:
Jim Myhrberg
2016-04-02 22:26:23 +01:00
parent 5f4dd92d7f 3a8a43ccdc
commit 3bfbc50918
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/layout-helpers.sh
View File

@@ -189,31 +189,39 @@ load_window() {
# - $2: (optional) Override default window name. # - $2: (optional) Override default window name.
# #
load_session() { load_session() {
local file="$1" local file
if [ ! -f "$file" ]; then if [ "${1#*/}" = "$1" ]; then
file="$TMUXIFIER_LAYOUT_PATH/$1.session.sh" # There's no slash in the path.
fi if [ -f "$TMUXIFIER_LAYOUT_PATH/$1.session.sh" ] || [ ! -f "$1" ]; then
file="$TMUXIFIER_LAYOUT_PATH/$1.session.sh"
if [ -f "$file" ]; then
if [ $# -gt 1 ]; then
session="$2"
else else
session="${1/%.session.sh}" # bash's 'source' requires an slash in the filename to not use $PATH.
session="${session/%.sh}" file="./$1"
fi
set_default_path=true
source "$file"
session=
# Reset `$session_root`.
if [[ "$session_root" != "$HOME" ]]; then
session_root="$HOME"
fi fi
else else
file="$1"
fi
if ! [ -f "$file" ]; then
echo "\"$1\" session layout not found." >&2 echo "\"$1\" session layout not found." >&2
return 1 return 1
fi 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. # Create a new session, returning 0 on success, 1 on failure.