Changeset 3934


Ignore:
Timestamp:
Apr 25, 2019 6:20:40 PM (2 years ago)
Author:
toby
Message:

try to avoid calling makeBat.py, etc. twice

Location:
install/g2complete
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • install/g2complete/post-link.bat

    r3910 r3934  
    22set "python=%PREFIX%\python.exe"
    33set "updatescript=%PREFIX%\GSASII\bootstrap.py"
     4REM "install" the GSAS-II package (create shortcuts, byte-compile...)
    45"%python%" "%updatescript%" --nonet
    5 "%python%" "%updatescript%"
     6REM Now try to update to latest GSAS-II version (will fail if no network)
     7"%python%" "%updatescript%" --noinstall
    68pause
    79set errorlevel=0
  • install/g2complete/post-link.sh

    r3910 r3934  
    22echo "Complete installation GSAS-II and update from APS subversion server if on network"
    33echo $PREFIX/bin/python
     4# "install" the GSAS-II package (create shortcuts, byte-compile...)
    45$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet
    5 $PREFIX/bin/python $PREFIX/GSASII/bootstrap.py
     6# Now try to update to latest GSAS-II version (will fail if no network)
     7$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall
  • install/g2complete/src/bootstrap.py

    r3930 r3934  
    270270val = ''
    271271if key:
    272     print('key=',key)
    273272    val = os.environ[key].strip()
    274     print('val=',val)
    275273if val:
    276274    if val[-1] == '/':
     
    404402    sys.exit()
    405403
    406 if allBinaries and skipDownloadSteps:
     404if allBinaries and not skipDownloadSteps:
    407405    print('Loading all binaries with command...')
    408406    if not GSASIIpath.svnSwitchDir('AllBinaries','',g2home+ 'Binaries/',None,True):
Note: See TracChangeset for help on using the changeset viewer.