From d64009cabe9acb879192b5610b13289ef9810217 Mon Sep 17 00:00:00 2001
From: rlbr <raphael.roberts48@gmail.com>
Date: Tue, 23 Oct 2018 12:50:11 -0500
Subject: [PATCH] added options needed

---
 hostnames.json => hostnames.ini |  0
 ssh-host.py                     | 24 ++++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)
 rename hostnames.json => hostnames.ini (100%)

diff --git a/hostnames.json b/hostnames.ini
similarity index 100%
rename from hostnames.json
rename to hostnames.ini
diff --git a/ssh-host.py b/ssh-host.py
index cefde3c..1a47426 100644
--- a/ssh-host.py
+++ b/ssh-host.py
@@ -1,13 +1,17 @@
 #!/usr/bin/python
 import subprocess
 import argparse
-import json
-with open(‘hostnames.json’) as file:
-hostnames = json.load(file)
-parser = argparse.ArgumentParser()
-parser.add_argument(‘-o’,’—-wan’,action = ‘store_true’)
-parser.add_argument(‘name’,help=‘name of config file to use (sans .cfg)’)
-parser.add_argument(‘arg’,nargs = ‘*’)
-args = parser.parse_args()
-cmd = [‘ssh’,’-F’,’~/.ssh/{}.cfg’.format(args.name)]
-subprocess.call(
\ No newline at end of file
+import configparser
+cp = configparser.ConfigParser(interpolate=configparser.ExtendedInterpolation())
+cp.read('hostnames.ini')
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    group = parser.add_mutually_exclusive_group(required=True)
+    group.add_argument('-o','—-wan',action = 'store_true')
+    group.add_argument('-l','--lan',action = 'store_true')
+    parser.add_argument('-p','--pre-script', help= 'script to run before connecting(in config dir)')
+    parser.add_argument('name',help='name of config file to use (sans .cfg)')
+    parser.add_argument('arg',nargs = '*')
+    args = parser.parse_args()
+    cmd = ['ssh','-F','~/.ssh/{}.cfg'.format(args.name)]
+    subprocess.call(cmd)