223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed hardwired installation directory from submitX scripts and added corresponding flexibility into make script

This commit is contained in:
Philip Eisenlohr 2010-08-17 21:22:24 +00:00
parent 3b671faae7
commit af2437c0af
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installation/Marc_Mentat2010_mods/Mentat_bin/submit1
View File

@ -4,7 +4,7 @@
# Normal exit status is 0. # Normal exit status is 0.
# #
DIR=/msc/marc2010 DIR=%INSTALLDIR%/marc2010
if test $MARCDIR1 if test $MARCDIR1
then then
DIR=$MARCDIR1 DIR=$MARCDIR1

2
installation/Marc_Mentat2010_mods/Mentat_bin/submit2
View File

@ -4,7 +4,7 @@
# Normal exit status is 0. # Normal exit status is 0.
# #
DIR=/msc/marc2010 DIR=%INSTALLDIR%/marc2010
if test $MARCDIR1 if test $MARCDIR1
then then
DIR=$MARCDIR1 DIR=$MARCDIR1

2
installation/Marc_Mentat2010_mods/Mentat_bin/submit3
View File

@ -4,7 +4,7 @@
# Normal exit status is 0. # Normal exit status is 0.
# #
DIR=/msc/marc2010 DIR=%INSTALLDIR%/marc2010
if test $MARCDIR1 if test $MARCDIR1
then then
DIR=$MARCDIR1 DIR=$MARCDIR1

13
installation/Marc_Mentat2010_mods/apply_MPIE_modifications
View File

@ -4,12 +4,14 @@ WORKINGDIR=`dirname $0`
INSTALLDIR="/msc" INSTALLDIR="/msc"
echo "Input path of MARC/MENTAT installation: [$INSTALLDIR]" echo "Input path of MARC/MENTAT installation: [$INSTALLDIR]"
read INSTALLDIR read INSTALLDIR
INSTALLDIR=${INSTALLDIR%/} # remove trailing slash
if [ -z $INSTALLDIR ]; then if [ -z $INSTALLDIR ]; then
INSTALLDIR="/msc" INSTALLDIR="/msc"
fi fi
# tools # tools
echo 'copying Marc tools...' echo 'copying Marc tools...'
theDIR=$INSTALLDIR/marc2010/tools
for filename in 'comp_user' \ for filename in 'comp_user' \
'comp_user_h' \ 'comp_user_h' \
'comp_user_mp' \ 'comp_user_mp' \
@ -17,24 +19,29 @@ for filename in 'comp_user' \
'run_h_marc' \ 'run_h_marc' \
'run_mp_marc' \ 'run_mp_marc' \
'include_linux_64'; do 'include_linux_64'; do
cp $WORKINGDIR/Marc_tools/$filename $INSTALLDIR/marc2010/tools cp $WORKINGDIR/Marc_tools/$filename $theDIR
echo $theDIR/$filename | xargs perl -pi -e "s:%INSTALLDIR%:${INSTALLDIR}:g"
echo $filename echo $filename
done done
# Mentat scripts # Mentat scripts
echo 'copying Mentat scripts...' echo 'copying Mentat scripts...'
theDIR=$INSTALLDIR/mentat2010/bin
for filename in 'edit_window' \ for filename in 'edit_window' \
'submit1' \ 'submit1' \
'submit2' \ 'submit2' \
'submit3'; do 'submit3'; do
cp $WORKINGDIR/Mentat_bin/$filename $INSTALLDIR/mentat2010/bin cp $WORKINGDIR/Mentat_bin/$filename $theDIR
echo $theDIR/$filename | xargs perl -pi -e "s:%INSTALLDIR%:${INSTALLDIR}:g"
echo $filename echo $filename
done done
# Mentat scripts # Mentat scripts
echo 'copying Mentat menus...' echo 'copying Mentat menus...'
theDIR=$INSTALLDIR/mentat2010/menus
for filename in 'job_run.ms'; do for filename in 'job_run.ms'; do
cp $WORKINGDIR/Mentat_menus/$filename $INSTALLDIR/mentat2010/menus cp $WORKINGDIR/Mentat_menus/$filename $theDIR
echo $theDIR/$filename | xargs perl -pi -e "s:%INSTALLDIR%:${INSTALLDIR}:g"
echo $filename echo $filename
done done