move clientbin one step upwards

to avoid suggesting it should show up in site-packages

diff --git a/Makefile b/Makefile
index 8446d4a..6989044 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -144,11 +144,11 @@ RSYNC_EXCLUDES            := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $
 RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 
-CLIENTS = $(shell ls sfa/clientbin/*.py)
+CLIENTS = $(shell ls clientbin/*.py)
 
 BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
        ./sfa/server/sfa-start.py \
-       ./sfa/clientbin/sfaadmin.py \
+       ./clientbin/sfaadmin.py \
        $(CLIENTS)
 
 synclib: synccheck

diff --git a/sfa/clientbin/Makefile b/clientbin/Makefile
similarity index 100%
rename from sfa/clientbin/Makefile
rename to clientbin/Makefile

diff --git a/sfa/clientbin/getNodes.py b/clientbin/getNodes.py
similarity index 100%
rename from sfa/clientbin/getNodes.py
rename to clientbin/getNodes.py

diff --git a/sfa/clientbin/getRecord.py b/clientbin/getRecord.py
similarity index 100%
rename from sfa/clientbin/getRecord.py
rename to clientbin/getRecord.py

diff --git a/sfa/clientbin/setRecord.py b/clientbin/setRecord.py
similarity index 100%
rename from sfa/clientbin/setRecord.py
rename to clientbin/setRecord.py

diff --git a/sfa/clientbin/sfaadmin.py b/clientbin/sfaadmin.py
similarity index 100%
rename from sfa/clientbin/sfaadmin.py
rename to clientbin/sfaadmin.py

diff --git a/sfa/clientbin/sfadump.py b/clientbin/sfadump.py
similarity index 100%
rename from sfa/clientbin/sfadump.py
rename to clientbin/sfadump.py

diff --git a/sfa/clientbin/sfascan.py b/clientbin/sfascan.py
similarity index 100%
rename from sfa/clientbin/sfascan.py
rename to clientbin/sfascan.py

diff --git a/sfa/clientbin/sfi.py b/clientbin/sfi.py
similarity index 100%
rename from sfa/clientbin/sfi.py
rename to clientbin/sfi.py

diff --git a/sfa/clientbin/sfiAddAttribute.py b/clientbin/sfiAddAttribute.py
similarity index 100%
rename from sfa/clientbin/sfiAddAttribute.py
rename to clientbin/sfiAddAttribute.py

diff --git a/sfa/clientbin/sfiAddLinks.py b/clientbin/sfiAddLinks.py
similarity index 100%
rename from sfa/clientbin/sfiAddLinks.py
rename to clientbin/sfiAddLinks.py

diff --git a/sfa/clientbin/sfiAddSliver.py b/clientbin/sfiAddSliver.py
similarity index 100%
rename from sfa/clientbin/sfiAddSliver.py
rename to clientbin/sfiAddSliver.py

diff --git a/sfa/clientbin/sfiDeleteAttribute.py b/clientbin/sfiDeleteAttribute.py
similarity index 100%
rename from sfa/clientbin/sfiDeleteAttribute.py
rename to clientbin/sfiDeleteAttribute.py

diff --git a/sfa/clientbin/sfiDeleteSliver.py b/clientbin/sfiDeleteSliver.py
similarity index 100%
rename from sfa/clientbin/sfiDeleteSliver.py
rename to clientbin/sfiDeleteSliver.py

diff --git a/sfa/clientbin/sfiListLinks.py b/clientbin/sfiListLinks.py
similarity index 100%
rename from sfa/clientbin/sfiListLinks.py
rename to clientbin/sfiListLinks.py

diff --git a/sfa/clientbin/sfiListNodes.py b/clientbin/sfiListNodes.py
similarity index 100%
rename from sfa/clientbin/sfiListNodes.py
rename to clientbin/sfiListNodes.py

diff --git a/sfa/clientbin/sfiListSlivers.py b/clientbin/sfiListSlivers.py
similarity index 100%
rename from sfa/clientbin/sfiListSlivers.py
rename to clientbin/sfiListSlivers.py

diff --git a/setup.py b/setup.py
index 2affbc7..a0c222a 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
-scripts = glob("sfa/clientbin/*.py") + \
+scripts = glob("clientbin/*.py") + \
     [ 
     'config/sfa-config-tty',
     'config/gen-sfa-cm-config.py',

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 72f15b3..c8082dc 100644 (file)
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -1,7 +1,6 @@
 #
 # sfi.py - basic SFA command-line client
-# the actual binary in sfa/clientbin essentially runs main()
-# this module is used in sfascan
+# this module is also used in sfascan
 #
 
 import sys