From 86962ed81ced0c59280fe55c3c922f3a461b76b5 Mon Sep 17 00:00:00 2001 From: rlbr Date: Wed, 24 Oct 2018 00:23:54 -0500 Subject: [PATCH] fully functional needed to add home folder --- ssh-host.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ssh-host.py b/ssh-host.py index 4434e03..3171654 100755 --- a/ssh-host.py +++ b/ssh-host.py @@ -1,8 +1,11 @@ +#!/usr/bin/python import subprocess import argparse import configparser +import os +HOME = os.path.expandvars('$HOME') cp = configparser.ConfigParser(interpolation=configparser.ExtendedInterpolation()) -cp.read('hostnames.ini') +cp.read('{HOME}/.ssh/config/hostnames.ini'.format(HOME=HOME)) if __name__ == "__main__": parser = argparse.ArgumentParser() group = parser.add_mutually_exclusive_group(required=True) @@ -13,12 +16,12 @@ if __name__ == "__main__": parser.add_argument('arg',nargs = '*') args = parser.parse_args() - if pre: - pre = '~/.ssh/config/{}'.format(args.pre_script) + if args.pre_script: + pre = '{HOME}/.ssh/config/{}'.format(args.pre_script,HOME=HOME) subprocess.check_call(pre) if args.wan: host = cp['wan'][args.name] elif args.lan: host = cp['lan'][args.name] - cmd = ['ssh','-F','~/.ssh/{}.cfg'.format(args.name),host] + args.arg - subprocess.call(cmd) \ No newline at end of file + cmd = ['ssh','-F','{HOME}/.ssh/config/{}.cfg'.format(args.name,HOME=HOME),host] + args.arg + subprocess.call(cmd)