Skip to content

Commit 8d39a3e

Browse files
committed
make sure server in load_workspace uses -2
1 parent ae37201 commit 8d39a3e

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

tmuxp/cli.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ def load_workspace(config_file, args):
232232
t = Server(
233233
socket_name=args.socket_name,
234234
socket_path=args.socket_path,
235+
colors=args.colors
235236
)
236237

237238
try:
@@ -301,7 +302,6 @@ def get_server_from_args(args):
301302
def command_freeze(args):
302303
""" Import teamocil config to tmuxp format. """
303304

304-
logger.error(args)
305305
session = t.findWhere({
306306
'session_name': args.session_name
307307
})
@@ -395,7 +395,6 @@ def command_load(args):
395395
else:
396396
logger.error('%s not found.' % configfile)
397397

398-
399398
def command_import_teamocil(args):
400399
""" Import teamocil config to tmuxp format. """
401400

tmuxp/config.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,16 +240,15 @@ def import_tmuxinator(sconf):
240240

241241
tmuxp_config = {}
242242

243-
logger.error(sconf)
244-
245243
if 'project_name' in sconf:
246244
tmuxp_config['session_name'] = sconf.pop('project_name')
247245
elif 'name' in sconf:
248246
tmuxp_config['session_name'] = sconf.pop('name')
249247
else:
250248
tmuxp_config['session_name'] = None
251249

252-
logger.error(tmuxp_config)
250+
if 'project_root' in sconf:
251+
tmuxp_config['start_directory'] = sconf.pop('project_root')
253252

254253
if 'cli_args' in sconf:
255254
tmuxp_config['config'] = sconf['cli_args']

0 commit comments

Comments
 (0)