Changeset 1202 for palm/trunk/SCRIPTS/batch_scp

Timestamp:

Jul 10, 2013 4:22:07 PM (12 years ago)

Author:

witha

Message:

script adjustments for Forwind cluster (lcflow)

File:

• palm/trunk/SCRIPTS/batch_scp (modified) (8 diffs)

palm/trunk/SCRIPTS/batch_scp

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# 
+# adjustments for Forwind cluster (lcflow): using absolute paths for ssh
 #
 # Former revisions:
@@ -258 +258 @@
 
 
+   # Using absolute paths for ssh on lcflow (nodes "cfd_*") as the paths of the
+   # job scheduler have changed
+ if [[ $(echo $local_host | cut -c1-3) = "cfd" ]]
+ then
+   SSH_BIN=/usr/bin/ssh
+ else
+   SSH_BIN=ssh
+ fi
+
+
     # PRUEFEN, OB LOKALE DATEI/LOKALES VERZEICHNIS VORHANDEN BZW. NICHT VORHANDEN
  if [[ $get = false ]]
@@ -317 +327 @@
     ssh $SSH_PORTOPT $local_user@gaiad "ssh $SSH_PORTOPT $1 -l $remote_user \"unset LANG; cd $3; ls -1; echo '*** list complete'\" "  > $filelist  2>&1
  else
-    ssh $SSH_PORTOPT $1 -l $remote_user "unset LANG; cd $3; ls -1; echo '*** list complete'" > $filelist  2>&1
+    $SSH_BIN $SSH_PORTOPT $1 -l $remote_user "unset LANG; cd $3; ls -1; echo '*** list complete'" > $filelist  2>&1
  fi
  ssh_status=$?
@@ -527 +537 @@
        ssh $SSH_PORTOPT $local_user@gaiad "ssh $1 -l $remote_user \"cd $3\" " > $filelist
     else
-       ssh $SSH_PORTOPT $1 -l $remote_user "cd $3" > $filelist
+       $SSH_BIN $SSH_PORTOPT $1 -l $remote_user "cd $3" > $filelist
     fi
     if [[ $? != 0 ]]
@@ -608 +618 @@
                 remote_size=`ssh $SSH_PORTOPT $local_user@gaiad "ssh $SSH_PORTOPT $1 -l $remote_user \"ls -al $catalog_name$4$zyklusnr\" "`
              else
-                remote_size=`ssh $SSH_PORTOPT $1 -l $remote_user "ls -al $catalog_name$4$zyklusnr"`
+                remote_size=`$SSH_BIN $SSH_PORTOPT $1 -l $remote_user "ls -al $catalog_name$4$zyklusnr"`
              fi
              remote_size=`echo $remote_size | cut -d" " -f5`
@@ -638 +648 @@
                 remote_size=`ssh $SSH_PORTOPT $local_user@gaiad "ssh $SSH_PORTOPT $1 -l $remote_user \"ls -al ${catalog_name}batch_scp_append_file.$random\" "`
              else
-                remote_size=`ssh $SSH_PORTOPT $1 -l $remote_user "ls -al ${catalog_name}batch_scp_append_file.$random"`
+                remote_size=`$SSH_BIN $SSH_PORTOPT $1 -l $remote_user "ls -al ${catalog_name}batch_scp_append_file.$random"`
              fi
              remote_size=`echo $remote_size | cut -d" " -f5`
@@ -657 +667 @@
              ssh $SSH_PORTOPT $local_user@gaiad "ssh $SSH_PORTOPT $1 -l $remote_user \"cd $3; cat batch_scp_append_file.$random >> $4$zyklusnr; rm batch_scp_append_file.$random; echo '*** append complete'\" " > $filelist
           else
-             ssh $SSH_PORTOPT $1 -l $remote_user "cd $3; cat batch_scp_append_file.$random >> $4$zyklusnr; rm batch_scp_append_file.$random; echo '*** append complete'" > $filelist
+             $SSH_BIN $SSH_PORTOPT $1 -l $remote_user "cd $3; cat batch_scp_append_file.$random >> $4$zyklusnr; rm batch_scp_append_file.$random; echo '*** append complete'" > $filelist
           fi
           if [[ $? != 0 ]]
@@ -677 +687 @@
           ssh $SSH_PORTOPT $local_user@gaiad "ssh $1 -l $remote_user \"mkdir -p $3\" "
        else
-          ssh $SSH_PORTOPT $1 -l $remote_user "mkdir -p $3"
+          $SSH_BIN $SSH_PORTOPT $1 -l $remote_user "mkdir -p $3"
        fi
        if [[ $? != 0 ]]