Skip to content

Commit d3fef7f

Browse files
jfindlaytony
authored andcommittedFeb 3, 2021
Support tmux -f option (#665)
Fixes #654. `libtmux.server.Server` already supports a `config` option, so extend the option to the `tmuxp load` command line.
1 parent 0ba9a1e commit d3fef7f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed
 

Diff for: ‎tmuxp/cli.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ def load_workspace(
423423
config_file,
424424
socket_name=None,
425425
socket_path=None,
426+
tmux_config_file=None,
426427
new_session_name=None,
427428
colors=None,
428429
detached=False,
@@ -537,7 +538,8 @@ def load_workspace(
537538
sconfig = config.trickle(sconfig)
538539

539540
t = Server( # create tmux server object
540-
socket_name=socket_name, socket_path=socket_path, colors=colors
541+
socket_name=socket_name, socket_path=socket_path,
542+
config_file=tmux_config_file, colors=colors,
541543
)
542544

543545
which('tmux') # raise exception if tmux not found
@@ -872,6 +874,7 @@ def command_freeze(session_name, socket_name, socket_path, force):
872874
@click.argument('config', type=ConfigPath(exists=True), nargs=-1)
873875
@click.option('-S', 'socket_path', help='pass-through for tmux -S')
874876
@click.option('-L', 'socket_name', help='pass-through for tmux -L')
877+
@click.option('-f', 'tmux_config_file', help='pass-through for tmux -f')
875878
@click.option('-s', 'new_session_name', help='start new session with new session name')
876879
@click.option('--yes', '-y', 'answer_yes', help='yes', is_flag=True)
877880
@click.option(
@@ -896,6 +899,7 @@ def command_load(
896899
config,
897900
socket_name,
898901
socket_path,
902+
tmux_config_file,
899903
new_session_name,
900904
answer_yes,
901905
detached,
@@ -933,6 +937,7 @@ def command_load(
933937
tmux_options = {
934938
'socket_name': socket_name,
935939
'socket_path': socket_path,
940+
'tmux_config_file': tmux_config_file,
936941
'new_session_name': new_session_name,
937942
'answer_yes': answer_yes,
938943
'colors': colors,

0 commit comments

Comments
 (0)