Revision: 3215
Author: janne.t.harkonen
Date: Thu May 6 04:20:27 2010
Log: remove start scripts correctly with Jython
http://code.google.com/p/robotframework/source/detail?r=3215
Modified:
/trunk/install.py
=======================================
--- /trunk/install.py Sun Apr 19 13:26:54 2009
+++ /trunk/install.py Thu May 6 04:20:27 2010
@@ -71,9 +71,14 @@
return robot_dir
def _remove_runners():
- for name in ['pybot', 'jybot', 'rebot']:
+ runners = ['pybot', 'jybot', 'rebot']
+ if os.name == 'java':
+ runners.remove('pybot')
+ for name in runners:
if os.sep == '\\':
_remove(os.path.join(sys.prefix, 'Scripts', name+'.bat'))
+ elif os.name == 'java':
+ _remove(os.path.join(sys.prefix, 'bin', name))
else:
for dirpath in ['/bin', '/usr/bin/', '/usr/local/bin' ]:
_remove(os.path.join(dirpath, name))
@@ -93,7 +98,6 @@
os.remove(path)
except Exception, err:
print "Removing '%s' failed: %s" % (path, err)
- sys.exit(1)
else:
print "Removed '%s'" % path
