Mercurial Repositories > eric / changeset
changeset
Merged the Mac OS X changes.
Tue, 16 Oct 2012 19:44:18 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 16 Oct 2012 19:44:18 +0200
- changeset 2150
- 4dd7b1634ea8
- parent 2149
- bd0bbb3043df (current diff)
- parent 2147
- 82034e3c157e (diff)
- child 2153
- 69569d2a556d
Merged the Mac OS X changes.
--- a/install.py Tue Oct 16 19:43:27 2012 +0200 +++ b/install.py Tue Oct 16 19:44:18 2012 +0200 @@ -378,8 +378,8 @@ # delete the Mac app bundle if os.path.exists("/Developer/Applications/Eric5"): shutil.rmtree("/Developer/Applications/Eric5") - if os.path.exists("/Applications/Eric5"): - shutil.rmtree("/Applications/Eric5") + if os.path.exists("/Applications/eric5.app"): + shutil.rmtree("/Applications/eric5.app") except IOError as msg: sys.stderr.write('IOError: {0}\nTry install with admin rights.\n'.format(msg)) @@ -571,9 +571,9 @@ """ global cfg, sourceDir - dirs = {"contents": "/Applications/Eric5/eric5.app/Contents/", - "exe": "/Applications/Eric5/eric5.app/Contents/MacOS", - "icns": "/Applications/Eric5/eric5.app/Contents/Resources"} + dirs = {"contents": "/Applications/eric5.app/Contents/", + "exe": "/Applications/eric5.app/Contents/MacOS", + "icns": "/Applications/eric5.app/Contents/Resources"} os.makedirs(dirs["contents"]) os.mkdir(dirs["exe"]) os.mkdir(dirs["icns"])
--- a/uninstall.py Tue Oct 16 19:43:27 2012 +0200 +++ b/uninstall.py Tue Oct 16 19:44:18 2012 +0200 @@ -137,8 +137,8 @@ # delete the Mac app bundle if os.path.exists("/Developer/Applications/Eric5"): shutil.rmtree("/Developer/Applications/Eric5") - if os.path.exists("/Applications/Eric5"): - shutil.rmtree("/Applications/Eric5") + if os.path.exists("/Applications/eric5.app"): + shutil.rmtree("/Applications/eric5.app") def main(argv):
