Changeset 4740 for install/g2full/g2postinstall.sh

Timestamp:

Jan 7, 2021 5:22:35 PM (2 years ago)

Author:

toby

Message:

more install work

File:

• install/g2full/g2postinstall.sh (modified) (2 diffs)

install/g2full/g2postinstall.sh

@@ -5 +5 @@
 echo "source $PREFIX/bin/activate" >> $PREFIX/start_G2_bootstrap.sh
 echo "$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py" >> $PREFIX/start_G2_bootstrap.sh
+# in case constructor changed the binary files
+$PREFIX/bin/svn revert $PREFIX/GSASII/bindist/*
 #
 # "install" the GSAS-II package (create shortcuts, byte-compile...)
 #
-#$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > /tmp/bootstrap1.log 2>> $PREFIX/GSASII/conda_inst.log 2>&1
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > $PREFIX/GSASII/conda_inst.log 2>&1
 # Now try to update to latest GSAS-II version (will fail if no network)
-#$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall > /tmp/bootstrap2.log 2>> $PREFIX/GSASII/conda_inst.log 2>&1
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall >> $PREFIX/GSASII/conda_inst.log 2>&1
+#
 # create start script
 echo "# Commands to start GSAS-II" > $PREFIX/start_GSASII.sh
@@ -20 +23 @@
    echo "$PREFIX/bin/python $PREFIX/GSASII/GSASII.py" >> $PREFIX/start_GSASII.sh
 fi
-# in case constructor changed the binary files
-$PREFIX/bin/svn revert $PREFIX/GSASII/bindist/*
 #create the GSAS-II app or Desktop icon (note that scripts run only on correct platform)
-$PREFIX/bin/python $PREFIX/GSASII/makeMacApp.py
-$PREFIX/bin/python $PREFIX/GSASII/makeLinux.py
+#$PREFIX/bin/python $PREFIX/GSASII/makeMacApp.py
+#$PREFIX/bin/python $PREFIX/GSASII/makeLinux.py
+echo "GSAS-II bootstrap completed" >> $PREFIX/.messages.txt