From 5a0963fb81e4c895ec1941ca1683df505da0af66 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 6 May 2010 14:17:53 +0000 Subject: [PATCH] added variable working dir (if apply_script is called from somewhere else) and made the script executable why using "comp_user?*" instead of "comp_user*" ?? (@Franz...) --- .../apply_MPIE_modifications | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) mode change 100644 => 100755 installation/Marc_Mentat2010_mods/apply_MPIE_modifications diff --git a/installation/Marc_Mentat2010_mods/apply_MPIE_modifications b/installation/Marc_Mentat2010_mods/apply_MPIE_modifications old mode 100644 new mode 100755 index 6043c086e..2d9f199eb --- a/installation/Marc_Mentat2010_mods/apply_MPIE_modifications +++ b/installation/Marc_Mentat2010_mods/apply_MPIE_modifications @@ -1,22 +1,24 @@ #!/bin/bash + +WORKINGDIR=`dirname $0` INSTALLDIR="/msc" echo "Input path of MARC/MENTAT installation: [$INSTALLDIR]" read INSTALLDIR if [ $INSTALLDIR = ""] ; then INSTALLDIR="/msc" fi -cp ./Marc_tools/comp_user $INSTALLDIR/marc2010/tools -cp ./Marc_tools/comp_user_h $INSTALLDIR/marc2010/tools -cp ./Marc_tools/comp_user_mp $INSTALLDIR/marc2010/tools -cp ./Marc_tools/run_marc $INSTALLDIR/marc2010/tools -cp ./Marc_tools/run_h_marc $INSTALLDIR/marc2010/tools -cp ./Marc_tools/run_mp_marc $INSTALLDIR/marc2010/tools -cp ./Marc_tools/include_linux64 $INSTALLDIR/marc2010/tools -cp ./Mentat_bin/edit_window $INSTALLDIR/mentat2010/bin -cp ./Mentat_bin/submit1 $INSTALLDIR/mentat2010/bin -cp ./Mentat_bin/submit2 $INSTALLDIR/mentat2010/bin -cp ./Mentat_bin/submit3 $INSTALLDIR/mentat2010/bin -cp ./Mentat_menus/job_run.ms $INSTALLDIR/mentat2010/menus +cp $WORKINGDIR/Marc_tools/comp_user $INSTALLDIR/marc2010/tools +cp $WORKINGDIR/Marc_tools/comp_user_h $INSTALLDIR/marc2010/tools +cp $WORKINGDIR/Marc_tools/comp_user_mp $INSTALLDIR/marc2010/tools +cp $WORKINGDIR/Marc_tools/run_marc $INSTALLDIR/marc2010/tools +cp $WORKINGDIR/Marc_tools/run_h_marc $INSTALLDIR/marc2010/tools +cp $WORKINGDIR/Marc_tools/run_mp_marc $INSTALLDIR/marc2010/tools +cp $WORKINGDIR/Marc_tools/include_linux64 $INSTALLDIR/marc2010/tools +cp $WORKINGDIR/Mentat_bin/edit_window $INSTALLDIR/mentat2010/bin +cp $WORKINGDIR/Mentat_bin/submit1 $INSTALLDIR/mentat2010/bin +cp $WORKINGDIR/Mentat_bin/submit2 $INSTALLDIR/mentat2010/bin +cp $WORKINGDIR/Mentat_bin/submit3 $INSTALLDIR/mentat2010/bin +cp $WORKINGDIR/Mentat_menus/job_run.ms $INSTALLDIR/mentat2010/menus $INSTALLDIR/mentat2010/bin/mentat -compile $INSTALLDIR/mentat2010/menus/linux64/main.msb chmod 555 $INSTALLDIR/marc2010/tools/run_*_marc -chmod 555 $INSTALLDIR/marc2010/tools/comp_user?* \ No newline at end of file +chmod 555 $INSTALLDIR/marc2010/tools/comp_user?*