Changeset 4745 for install

Timestamp:

Jan 7, 2021 9:42:11 PM (2 years ago)

Author:

toby

Message:

more work on install for OSX

Location:

install

Files:

• bootstrap.py (modified) (6 diffs)
• g2complete/src/bootstrap.py (modified) (6 diffs)
• g2full/g2postinstall.sh (modified) (2 diffs)

install/bootstrap.py

@@ -272 +272 @@
 
 def svncleanup(spath):
-    cmd = [svn, 'cleanup', spath]
-    s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
-    out,err = MakeByte2str(s.communicate())
-    if err:
-        print('subversion cleanup returned an error:')
-        if out: print(out)
-        if err: print(err)
     svntmp = os.path.join(spath,'.svn','tmp')
     if not os.path.exists(svntmp):
@@ -285 +278 @@
         s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
         out,err = MakeByte2str(s.communicate())
+        if out: print(out)
+        if err: print(err)
+    cmd = [svn, 'cleanup', spath]
+    s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
+    out,err = MakeByte2str(s.communicate())
+    if err:
+        print('subversion cleanup returned an error:')
         if out: print(out)
         if err: print(err)
@@ -497 +497 @@
 if not skipDownloadSteps:
     # patch: switch GSAS-II location if linked to XOR server (relocated May/June 2017)
-    cmd = [svn, 'info']
+    cmd = [svn, 'info',path2GSAS2]
     p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     res,err = p.communicate()
@@ -503 +503 @@
         print('Switching previous install with .xor. download location to\n\thttps://subversion.xray.aps.anl.gov/pyGSAS')
         cmd = [svn, 'switch','--relocate','https://subversion.xor.aps.anl.gov/pyGSAS',
-               'https://subversion.xray.aps.anl.gov/pyGSAS']
+               'https://subversion.xray.aps.anl.gov/pyGSAS',path2GSAS2]
         if proxycmds: cmd += proxycmds
         p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
@@ -512 +512 @@
             print(res)
     # patch: switch GSAS-II location if switched to 2frame version (removed August 2017)
-    if '2frame' in str(res):
+    elif '2frame' in str(res):
         print('Switching previous 2frame install to trunk\n\thttps://subversion.xray.aps.anl.gov/pyGSAS')
         cmd = [svn, 'switch',g2home + '/trunk',path2GSAS2,
@@ -524 +524 @@
             print(err)
             print(res)
+    elif 'not a working' not in str(res):
+        svncleanup(path2GSAS2)
 
     print('\n'+75*'*')

install/g2complete/src/bootstrap.py

@@ -272 +272 @@
 
 def svncleanup(spath):
-    cmd = [svn, 'cleanup', spath]
-    s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
-    out,err = MakeByte2str(s.communicate())
-    if err:
-        print('subversion cleanup returned an error:')
-        if out: print(out)
-        if err: print(err)
     svntmp = os.path.join(spath,'.svn','tmp')
     if not os.path.exists(svntmp):
@@ -285 +278 @@
         s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
         out,err = MakeByte2str(s.communicate())
+        if out: print(out)
+        if err: print(err)
+    cmd = [svn, 'cleanup', spath]
+    s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
+    out,err = MakeByte2str(s.communicate())
+    if err:
+        print('subversion cleanup returned an error:')
         if out: print(out)
         if err: print(err)
@@ -497 +497 @@
 if not skipDownloadSteps:
     # patch: switch GSAS-II location if linked to XOR server (relocated May/June 2017)
-    cmd = [svn, 'info']
+    cmd = [svn, 'info',path2GSAS2]
     p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     res,err = p.communicate()
@@ -503 +503 @@
         print('Switching previous install with .xor. download location to\n\thttps://subversion.xray.aps.anl.gov/pyGSAS')
         cmd = [svn, 'switch','--relocate','https://subversion.xor.aps.anl.gov/pyGSAS',
-               'https://subversion.xray.aps.anl.gov/pyGSAS']
+               'https://subversion.xray.aps.anl.gov/pyGSAS',path2GSAS2]
         if proxycmds: cmd += proxycmds
         p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
@@ -512 +512 @@
             print(res)
     # patch: switch GSAS-II location if switched to 2frame version (removed August 2017)
-    if '2frame' in str(res):
+    elif '2frame' in str(res):
         print('Switching previous 2frame install to trunk\n\thttps://subversion.xray.aps.anl.gov/pyGSAS')
         cmd = [svn, 'switch',g2home + '/trunk',path2GSAS2,
@@ -524 +524 @@
             print(err)
             print(res)
+    elif 'not a working' not in str(res):
+        svncleanup(path2GSAS2)
 
     print('\n'+75*'*')

install/g2full/g2postinstall.sh

@@ -10 +10 @@
 # "install" the GSAS-II package (create shortcuts, byte-compile...)
 #
-$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > $PREFIX/GSASII/conda_inst.log 2>&1
+echo "launching bootstrap process"
+#$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > $PREFIX/GSASII/conda_inst.log 2>&1
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet 2> $PREFIX/GSASII/conda_postinst.log
 # Now try to update to latest GSAS-II version (will fail if no network)
-$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall >> $PREFIX/GSASII/conda_inst.log 2>&1
+#$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall >> $PREFIX/GSASII/conda_inst.log 2>&1
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall 2>> $PREFIX/GSASII/conda_postinst.log
 #
 # create start script
@@ -26 +29 @@
 #$PREFIX/bin/python $PREFIX/GSASII/makeMacApp.py
 #$PREFIX/bin/python $PREFIX/GSASII/makeLinux.py
-echo "GSAS-II bootstrap completed" >> $PREFIX/.messages.txt
+echo "GSAS-II bootstrap completed"