Changeset 3107 for install

Timestamp:

Oct 2, 2017 3:01:00 PM (6 years ago)

Author:

toby

Message:

more diagnostics; start improvements on Linux shortcut

File:

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

install/bootstrap.py

@@ -5 +5 @@
 
 g2home = 'https://subversion.xray.aps.anl.gov/pyGSAS/'
+path2GSAS2 = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
+print('Running bootstrap from {}'.format(path2GSAS2))
 ################################################################################
 ################################################################################
@@ -161 +163 @@
             print traceback.format_exc()                 
             sys.exit() 
-# path to where this script is located
-gsaspath = os.path.split(sys.argv[0])[0]
-if not gsaspath: gsaspath = os.path.curdir
-gsaspath = os.path.abspath(os.path.expanduser(gsaspath))
 
 print '\nChecking for subversion...',
@@ -180 +178 @@
     print 'done.'
     
-print 'Ready to bootstrap GSAS-II from repository\n\t',g2home,'\nto '+gsaspath
+print 'Ready to bootstrap GSAS-II from repository\n\t',g2home,'\nto '+path2GSAS2
 proxycmds = []
-proxyinfo = os.path.join(gsaspath,"proxyinfo.txt")
+proxyinfo = os.path.join(path2GSAS2,"proxyinfo.txt")
 host = None
 port = '8080'
@@ -228 +226 @@
 if '2frame' in res:
     print('Switching previous 2frame install to trunk\n\thttps://subversion.xray.aps.anl.gov/pyGSAS')
-    cmd = [svn, 'switch',g2home + '/trunk',gsaspath,
+    cmd = [svn, 'switch',g2home + '/trunk',path2GSAS2,
            '--non-interactive','--trust-server-cert',
            '--accept','theirs-conflict','--force','--ignore-ancestry']
@@ -239 +237 @@
         print(res)
 
-cmd = [svn, 'co', g2home+ 'trunk/', gsaspath, '--non-interactive', '--trust-server-cert']
+cmd = [svn, 'co', g2home+ 'trunk/', path2GSAS2, '--non-interactive', '--trust-server-cert']
 if proxycmds: cmd += proxycmds
 msg = 'Now preparing to install GSAS-II'
@@ -253 +251 @@
     print('subversion returned an error:')
     print(err)
-    print('Retrying with command for older svn version...')
-    cmd = [svn, 'co', g2home+ 'trunk/', gsaspath]
+    print('Retrying with a cleanup and a command for older svn version...')
+    cmd = [svn, 'cleanup', path2GSAS2]
+    s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
+    out,err = s.communicate()    
+    cmd = [svn, 'co', g2home+ 'trunk/', path2GSAS2]
     if proxycmds: cmd += proxycmds
     for item in cmd: print item,
@@ -263 +264 @@
         print('subversion returned an error:')
         print(err)
-        print('  *** GSAS-II failed to be installed: you likely have a network access')
+        print('  *** GSAS-II failed to be installed. In case the cleanup worked, try running this again')
+        print('  *** If this installation continues to fail, a likely reason is a network access')
         print('  *** problem, most commonly because you need to use a network proxy. Please')
         print('  *** check with a network administrator or use http://www.whatismyproxy.com/\n')
@@ -309 +311 @@
 """
 p = subprocess.Popen([sys.executable,'-c',script],stdout=subprocess.PIPE,stderr=subprocess.PIPE,
-                     cwd=gsaspath)
+                     cwd=path2GSAS2)
 res,err = p.communicate()
 if '==OK==' not in res or p.returncode != 0:
@@ -335 +337 @@
 print 'Byte-compiling all .py files...',
 import compileall
-compileall.compile_dir(gsaspath,quiet=True)
+compileall.compile_dir(path2GSAS2,quiet=True)
 print 'done'
 #===========================================================================
@@ -342 +344 @@
 # on Windows, make a batch file with Python and GSAS-II location hard-coded
 if sys.platform.startswith('win') and os.path.exists(
-    os.path.join(gsaspath,"makeBat.py")):
-    execfile(os.path.join(gsaspath,"makeBat.py"))
+    os.path.join(path2GSAS2,"makeBat.py")):
+    execfile(os.path.join(path2GSAS2,"makeBat.py"))
 #===========================================================================
 # on a Mac, make an applescript 
 elif sys.platform.startswith('darwin') and os.path.exists(
-    os.path.join(gsaspath,"makeMacApp.py")):
-    sys.argv = [os.path.join(gsaspath,"makeMacApp.py")]
+    os.path.join(path2GSAS2,"makeMacApp.py")):
+    sys.argv = [os.path.join(path2GSAS2,"makeMacApp.py")]
     print(u'running '+sys.argv[0])
     execfile(sys.argv[0])
@@ -356 +358 @@
     desktop_template = """
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
 Terminal=false
-Exec=xterm -hold -e %s
+Exec=xterm -hold -e bash -c "{} {}"
 Name=GSAS-II
-Icon=%s
+Icon={}
+Categories=Science;
 """
-    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')
+    loc = os.path.expanduser('~/Desktop/')
+    if "XDG_DATA_HOME" in os.environ and os.path.exists(os.path.join(os.environ.get("XDG_DATA_HOME"),"applications")):
+        loc = os.path.join(os.environ.get("XDG_DATA_HOME"),"applications")
+    elif "HOME" in os.environ and os.path.exists(os.path.join(os.environ.get("HOME"),".local/share/applications")):
+        loc = os.path.join(os.environ.get("HOME"),".local/share/applications")
+    elif not os.path.exists(loc):
+        loc = os.path.expanduser('~/')
+    dfile = os.path.join(loc,'GSASII.desktop')
+    icon = os.path.join(path2GSAS2, 'gsas2.png')
+    script = os.path.join(path2GSAS2, '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))
+    try:
+        open(dfile,'w').write(desktop_template.format(sys.executable,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) 
-
+        print("created GNOME/KDE desktop shortcut "+dfile)
+    except:
+        print("creation of file failed: "+dfile)
+