X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=b63cffe26d45701bbcd68fdcf3b04eb46bcbc11c;hb=bc00411ea80b7d96b2b8c857e319b9e5cd39b98c;hp=0b1a35cb1140e95c2317805fbe3bc6b28c6ecd88;hpb=857d506c4eaf0cf863aff9122639e5f9e71a6dd6;p=sfa.git

diff --git a/setup.py b/setup.py
index 0b1a35cb..b63cffe2 100755
--- a/setup.py
+++ b/setup.py
@@ -12,19 +12,18 @@ version = '0.2'
 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   
@@ -67,10 +66,14 @@ and the Geni API.
     site_packages_path = map(add_geni_path, site_packages_path)
     # python path usualy has /urs/local/lib/ path , filter this out
     site_packages_path = filter(lambda x: 'local' not in x, site_packages_path) 
-    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)
+
+    # 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)