Changeset 3934

Timestamp:

Apr 25, 2019 6:20:40 PM (5 years ago)

Author:

toby

Message:

try to avoid calling makeBat.py, etc. twice

Location:

install/g2complete

Files:

• post-link.bat (modified) (1 diff)
• post-link.sh (modified) (1 diff)
• src/bootstrap.py (modified) (2 diffs)

install/g2complete/post-link.bat

@@ -2 +2 @@
 set "python=%PREFIX%\python.exe"
 set "updatescript=%PREFIX%\GSASII\bootstrap.py"
+REM "install" the GSAS-II package (create shortcuts, byte-compile...)
 "%python%" "%updatescript%" --nonet
-"%python%" "%updatescript%"
+REM Now try to update to latest GSAS-II version (will fail if no network)
+"%python%" "%updatescript%" --noinstall
 pause
 set errorlevel=0

install/g2complete/post-link.sh

@@ -2 +2 @@
 echo "Complete installation GSAS-II and update from APS subversion server if on network"
 echo $PREFIX/bin/python
+# "install" the GSAS-II package (create shortcuts, byte-compile...)
 $PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet
-$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py
+# Now try to update to latest GSAS-II version (will fail if no network)
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall

install/g2complete/src/bootstrap.py

@@ -270 +270 @@
 val = ''
 if key:
-    print('key=',key)
     val = os.environ[key].strip()
-    print('val=',val)
 if val:
     if val[-1] == '/':
@@ -404 +402 @@
     sys.exit()
 
-if allBinaries and skipDownloadSteps:
+if allBinaries and not skipDownloadSteps:
     print('Loading all binaries with command...')
     if not GSASIIpath.svnSwitchDir('AllBinaries','',g2home+ 'Binaries/',None,True):