Changeset 1085 for install/bootstrap.py

Timestamp:

Oct 4, 2013 4:19:28 PM (10 years ago)

Author:

toby

Message:

installer uses xterm on GNOME shortcut

File:

• install/bootstrap.py (modified) (5 diffs)

install/bootstrap.py

@@ -17 +17 @@
     for pkg in missing: print " ",pkg,
     print 
-    print "We suggest installing the Canopy Express package (must be 32 bit) at\nhttp://www.enthought.com/store"
+    print "We suggest installing the Canopy Express package (must be 32 bit for Mac) at\nhttp://www.enthought.com/store"
     sys.exit()
 
@@ -48 +48 @@
     #    if ans.lower().find('no') > -1: sys.exit()
     repos = 'linux'
-    print 'Linux, Intel-compatible'
+    print 'Linux, assuming Intel-compatible'
 elif sys.platform == "darwin" and platform.processor() == 'i386':
     repos = 'osxi86'
@@ -54 +54 @@
 elif sys.platform == "darwin":
     repos = 'osxppc'
-    print 'Mac OS X, PowerPC -- you will need to run f2py on fsource files'
+    print 'Mac OS X, PowerPC -- you will need to run scons on fsource files'
 else:
-    print 'Unidentifed platform -- you may need to run f2py on fsource files'
+    print 'Unidentifed platform -- you may need to run scons on fsource files'
 
 cmds = (
@@ -80 +80 @@
 # On linux, make desktop icon
 if sys.platform.startswith('linux'):
-    os.chmod(os.path.join(gsaspath, 'GSASII.py'),
-             stat.S_IXUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IXOTH) 
-    if os.path.exists(os.path.expanduser('~/Desktop/')):
-        open(os.path.expanduser('~/Desktop/GSASII.desktop'),'w').write('''
+    desktop_template = """
 [Desktop Entry]
 Encoding=UTF-8
@@ -89 +86 @@
 Type=Application
 Terminal=false
-Exec=%s
+Exec=xterm -hold -e %s
 Name=GSAS-II
 Icon=%s
-''' % (os.path.join(gsaspath, 'GSASII.py'),os.path.join(gsaspath, 'gsas2.png')))
-        os.chmod(os.path.expanduser('~/Desktop/GSASII.desktop'),
-                 stat.S_IWUSR | stat.S_IXUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IXOTH) 
+"""
+    loc = '~/Desktop/'
+    eloc = os.path.expanduser(loc)
+    dfile = os.path.join(eloc,'GSASII.desktop')
+    icon = os.path.join(gsaspath, 'gsas2.png')
+    script = os.path.join(gsaspath, 'GSASII.py')
+    os.chmod(script, # make the .py file executable and readable
+             stat.S_IXUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IXOTH)
+    if os.path.exists(eloc):
+        open(dfile,'w').write(desktop_template % (script,icon))
+        os.chmod(
+            dfile,
+            stat.S_IWUSR | stat.S_IXUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IXOTH)
+        print("created GNOME desktop shortcut "+dfile)