Changeset 4736 for install/g2complete/post-link.sh

Timestamp:

Jan 7, 2021 3:53:49 PM (3 years ago)

Author:

toby

Message:

more install work

File:

• install/g2complete/post-link.sh (modified) (1 diff)

install/g2complete/post-link.sh

@@ -1 +1 @@
 #!/bin/bash
-echo "Complete installation GSAS-II and update from APS subversion server, if on network" > $PREFIX/GSASII/conda_inst.log
-# create bootstrap script
-#echo "# Commands to run GSAS-II load/update process" > $CONDA_ROOT/start_G2_bootstrap.sh
-#echo "source $CONDA_ROOT/bin/activate $CONDA_DEFAULT_ENV" >> $CONDA_ROOT/start_G2_bootstrap.sh
-#echo "$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py" >> $CONDA_ROOT/start_G2_bootstrap.sh
+echo "Complete complete installation GSAS-II from APS subversion server" > $PREFIX/GSASII/conda_inst.log
+# Note: for g2complete create scripts to access bootstrap & start are moved to g2postinstall.sh (g2full)
 #
 # "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
-# create start script
-#echo "# Commands to start GSAS-II" > $CONDA_ROOT/start_GSASII.sh
-#echo "source $CONDA_ROOT/bin/activate $CONDA_DEFAULT_ENV" >> $CONDA_ROOT/start_GSASII.sh
-#if [ -e $PREFIX/bin/pythonw ]
-#then
-#   echo "$PREFIX/bin/pythonw $PREFIX/GSASII/GSASII.py" >> $CONDA_ROOT/start_GSASII.sh
-#else
-#   echo "$PREFIX/bin/python $PREFIX/GSASII/GSASII.py" >> $CONDA_ROOT/start_GSASII.sh
-#fi
-#cp $PREFIX/GSASII/conda_inst.log $PREFIX/.messages.txt
-echo "GSAS-II bootstrap completed" > $PREFIX/.messages.txt
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall >> $PREFIX/GSASII/conda_inst.log 2>&1
+cp $PREFIX/GSASII/conda_inst.log $PREFIX/.messages.txt
+echo "GSAS-II bootstrap completed" >> $PREFIX/.messages.txt