Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func

2 files changed, 15 insertions, 6 deletions

diff --git a/scripts/certmaster b/scripts/certmaster
index 1be4c58..f4bcf53 100755
--- a/scripts/certmaster
+++ b/scripts/certmaster
@@ -1,11 +1,6 @@
 #!/usr/bin/python
 
-import sys
-import distutils.sysconfig
-
-sys.path.append("%s/func" % distutils.sysconfig.get_python_lib())
-
-import certmaster
+from func import certmaster
 
 defaults = { 'listen_addr': 'localhost',
              'listen_port': '51235',
diff --git a/scripts/func b/scripts/func
new file mode 100755
index 0000000..2afb4e7
--- /dev/null
+++ b/scripts/func
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+
+import sys
+import distutils.sysconfig
+
+# sys.path.append("%s/func" % distutils.sysconfig.get_python_lib())
+
+import func.overlord.client as client
+
+myname, argv = sys.argv[0], sys.argv[1:]
+cli = client.FuncCommandLine(myname, argv)
+cli.run()
+
+