Changeset 4747


Ignore:
Timestamp:
Jan 7, 2021 9:56:07 PM (11 months ago)
Author:
toby
Message:

more work on install for OSX

Location:
install
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • install/bootstrap.py

    r4745 r4747  
    582582            BailOut(msg)
    583583    print('\n'+75*'*')
     584else:
     585    svncleanup(path2GSAS2)
    584586
    585587# subsequent commands require GSASIIpath which better be here now, import it
  • install/g2complete/src/bootstrap.py

    r4745 r4747  
    582582            BailOut(msg)
    583583    print('\n'+75*'*')
     584else:
     585    svncleanup(path2GSAS2)
    584586
    585587# subsequent commands require GSASIIpath which better be here now, import it
  • install/g2full/g2postinstall.sh

    r4745 r4747  
    55echo "source $PREFIX/bin/activate" >> $PREFIX/start_G2_bootstrap.sh
    66echo "$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py" >> $PREFIX/start_G2_bootstrap.sh
    7 # in case constructor changed the binary files
     7# constructor fixups, missing empty directories & changed binary files
     8mkdir -p $PREFIX/GSASII/.svn/tmp
    89$PREFIX/bin/svn revert $PREFIX/GSASII/bindist/*
    910#
     
    1213echo "launching bootstrap process"
    1314#$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > $PREFIX/GSASII/conda_inst.log 2>&1
    14 $PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet 2> $PREFIX/GSASII/conda_postinst.log
     15$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet
    1516# Now try to update to latest GSAS-II version (will fail if no network)
    1617#$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall >> $PREFIX/GSASII/conda_inst.log 2>&1
    17 $PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall 2>> $PREFIX/GSASII/conda_postinst.log
     18$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall
    1819#
    1920# create start script
Note: See TracChangeset for help on using the changeset viewer.