summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-09-25 16:21:27 -0400
committerMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-09-25 16:21:27 -0400
commit637c6db316c12384f89825e12bf47dda7609ebb9 (patch)
tree8d1e2933b39fef68a9becd764a013eb4a9f64864
parent4d36563e61ab0d0b6617aae18c9a6962701c6c59 (diff)
downloadthird_party-func-637c6db316c12384f89825e12bf47dda7609ebb9.tar.gz
third_party-func-637c6db316c12384f89825e12bf47dda7609ebb9.tar.xz
third_party-func-637c6db316c12384f89825e12bf47dda7609ebb9.zip
Adding func (command line client to be run from master) to /usr/bin
-rw-r--r--func.spec1
-rwxr-xr-xscripts/func14
-rw-r--r--setup.py2
3 files changed, 16 insertions, 1 deletions
diff --git a/func.spec b/func.spec
index c516fb9..30c6ab8 100644
--- a/func.spec
+++ b/func.spec
@@ -35,6 +35,7 @@ rm -fr $RPM_BUILD_ROOT
%files
%{_bindir}/funcd
+%{_bindir}/func
%{_bindir}/certmaster
/etc/init.d/funcd
/etc/init.d/certmaster
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()
+
+
diff --git a/setup.py b/setup.py
index 156b824..8fcd0ca 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ if __name__ == "__main__":
author_email = "func-list@redhat.com",
url = "https://hosted.fedoraproject.org/projects/func/",
license = "GPL",
- scripts = ["scripts/funcd", "scripts/certmaster"],
+ scripts = ["scripts/funcd", "scripts/func", "scripts/certmaster"],
# package_data = { '' : ['*.*'] },
package_dir = {"%s" % NAME: "%s" % NAME,
"%s/minion" % NAME: "minion/",