added --extractgids, --dumpparents

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index cb1c5b8..b63cffe 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -9,22 +9,21 @@ import os, sys
 import shutil
 
 version = '0.2'
-scripts = ['geni/gimport.py', 'geni/plc.py', 'cmdline/sfi.py']
+scripts = ['geni/gimport.py', 'geni/plc.py', 'cmdline/sfi.py', 'geni-config-tty']
 package_dirs = ['geni', 'geni/util', 'geni/methods']
 data_files = [('/etc/geni/', ['geni/aggregates.xml', 'geni/registries.xml', 'geni/util/geni_config', 'cmdline/configSfi.sh']),
-              ('/etc/init.d/', ['geni/geniwrapper'])
-                ]
+              ('/etc/init.d/', ['geni/geniwrapper'])]
 symlinks = ['/usr/share/geniwrapper']
 initscripts = ['/etc/init.d/geniwrapper']
         
-if sys.argv[1] in ['uninstall', 'remove', 'delete']:
+if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     python_path = sys.path
     site_packages_only = lambda path: path.endswith('site-packages') 
     site_packages_path = filter(site_packages_only, python_path)
     add_geni_path = lambda path: path + os.sep + 'geni'
     site_packages_path = map(add_geni_path, site_packages_path) 
     remove_dirs = ['/etc/geni/'] + site_packages_path
-    remove_files = ['/usr/bin/gimport.py', '/usr/bin/plc.py', '/usr/bin/sfi.py'] + \
+    remove_files = ['/usr/bin/gimport.py', '/usr/bin/plc.py', '/usr/bin/sfi.py', '/usr/bin/geni-config-tty'] + \
                     symlinks + initscripts
     
     # remove files   
@@ -65,6 +64,16 @@ and the Geni API.
     site_packages_path = filter(site_packages_only, python_path)
     add_geni_path = lambda path: path + os.sep + 'geni'
     site_packages_path = map(add_geni_path, site_packages_path)
-    for src in site_packages_path:
-        for dst in symlinks:
-            os.symlink(src, dst)    
+    # python path usualy has /urs/local/lib/ path , filter this out
+    site_packages_path = filter(lambda x: 'local' not in x, site_packages_path) 
+
+    # we can not do this here as installation root might change paths
+    # - baris
+    #
+    # for src in site_packages_path:
+    #     for dst in symlinks:
+    #         try: 
+    #             os.symlink(src, dst)
+    #         except: pass
+    # for initscript in initscripts:
+    #     os.chmod(initscript, 00744)