diff --git a/installation/Marc_Mentat2010_mods/Mentat_bin/submit1 b/installation/Marc_Mentat2010_mods/Mentat_bin/submit1 index 276734208..3940dc7a9 100644 --- a/installation/Marc_Mentat2010_mods/Mentat_bin/submit1 +++ b/installation/Marc_Mentat2010_mods/Mentat_bin/submit1 @@ -4,7 +4,7 @@ # Normal exit status is 0. # -DIR=/msc/marc2010 +DIR=%INSTALLDIR%/marc2010 if test $MARCDIR1 then DIR=$MARCDIR1 diff --git a/installation/Marc_Mentat2010_mods/Mentat_bin/submit2 b/installation/Marc_Mentat2010_mods/Mentat_bin/submit2 index 9061137e6..ec5891a6a 100644 --- a/installation/Marc_Mentat2010_mods/Mentat_bin/submit2 +++ b/installation/Marc_Mentat2010_mods/Mentat_bin/submit2 @@ -4,7 +4,7 @@ # Normal exit status is 0. # -DIR=/msc/marc2010 +DIR=%INSTALLDIR%/marc2010 if test $MARCDIR1 then DIR=$MARCDIR1 diff --git a/installation/Marc_Mentat2010_mods/Mentat_bin/submit3 b/installation/Marc_Mentat2010_mods/Mentat_bin/submit3 index 678149b1c..a0927c01b 100644 --- a/installation/Marc_Mentat2010_mods/Mentat_bin/submit3 +++ b/installation/Marc_Mentat2010_mods/Mentat_bin/submit3 @@ -4,7 +4,7 @@ # Normal exit status is 0. # -DIR=/msc/marc2010 +DIR=%INSTALLDIR%/marc2010 if test $MARCDIR1 then DIR=$MARCDIR1 diff --git a/installation/Marc_Mentat2010_mods/apply_MPIE_modifications b/installation/Marc_Mentat2010_mods/apply_MPIE_modifications index 23f276852..07ca8cbdf 100755 --- a/installation/Marc_Mentat2010_mods/apply_MPIE_modifications +++ b/installation/Marc_Mentat2010_mods/apply_MPIE_modifications @@ -4,12 +4,14 @@ WORKINGDIR=`dirname $0` INSTALLDIR="/msc" echo "Input path of MARC/MENTAT installation: [$INSTALLDIR]" read INSTALLDIR +INSTALLDIR=${INSTALLDIR%/} # remove trailing slash if [ -z $INSTALLDIR ]; then INSTALLDIR="/msc" fi # tools echo 'copying Marc tools...' +theDIR=$INSTALLDIR/marc2010/tools for filename in 'comp_user' \ 'comp_user_h' \ 'comp_user_mp' \ @@ -17,24 +19,29 @@ for filename in 'comp_user' \ 'run_h_marc' \ 'run_mp_marc' \ '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 done # Mentat scripts echo 'copying Mentat scripts...' +theDIR=$INSTALLDIR/mentat2010/bin for filename in 'edit_window' \ 'submit1' \ 'submit2' \ '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 done # Mentat scripts echo 'copying Mentat menus...' +theDIR=$INSTALLDIR/mentat2010/menus 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 done