Changeset 2923

Timestamp:

Jul 8, 2017 3:12:16 PM (6 years ago)

Author:

toby

Message:

add fixes

Location:

branch/2frame

Files:

• GSASIIctrlGUI.py (modified) (1 diff)
• GSASIIpath.py (modified) (2 diffs)

branch/2frame/GSASIIctrlGUI.py

@@ -3746 +3746 @@
         '''
         testbranch = '/branch/2frame'
-        if GSASIIpath.svnTestBranch():
+        if not GSASIIpath.svnTestBranch():
             dlg = wx.MessageDialog(self.frame,
-                                   'Switching from test to standard GSAS-II version',
+                                   'Switching to test GSAS-II version',
                                    'Confirm Switch',
                                    wx.OK|wx.CANCEL)

branch/2frame/GSASIIpath.py

@@ -391 +391 @@
     if proxycmds: cmd += proxycmds
     if verbose: print(u"Loading files to "+fpath+u"\n  from "+URL)
-    print cmd
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out,err = s.communicate()
@@ -763 +762 @@
         print("Update to current version")
         svnUpdateDir(loc)
-    print sys.executable
+    ex = sys.executable
+    if sys.platform == "darwin": # mac requires pythonw which is not always reported as sys.executable
+        if os.path.exists(ex+'w'): ex += 'w'
     if project:
         print("Restart GSAS-II with project file "+str(project))
-        subprocess.Popen([sys.executable,os.path.join(loc,'GSASII.py'),project])
+        subprocess.Popen([ex,os.path.join(loc,'GSASII.py'),project])
     else:
         print("Restart GSAS-II without a project file ")
-        subprocess.Popen([sys.executable,os.path.join(loc,'GSASII.py')])
+        subprocess.Popen([ex,os.path.join(loc,'GSASII.py')])
     print 'exiting update process'
     sys.exit()