Changeset 4425

Timestamp:

Feb 26, 2020 3:35:00 PM (5 years ago)

Author:

raasch

Message:

hard coded path to the fileconnection file replaced by a path that is based on the source path which has been given in the configuration file

File:

• palm/trunk/SCRIPTS/palmrun (modified) (4 diffs)

palm/trunk/SCRIPTS/palmrun

@@ -27 +27 @@
 # -----------------
 # $Id$
+# hard coded path to the fileconnection file replaced by a path that is based on
+# the source path which has been given in the configuration file
+# 
+# 4303 2019-11-25 08:55:18Z raasch
 # Abort if temporary working catalog cannot be created
 # 
@@ -256 +260 @@
  execute_command=""
  execution_error=false
- fileconnection_file=trunk/SCRIPTS/.palm.iofiles
+ fileconnection_file=""
  global_revision=""
  hostfile=""
@@ -457 +461 @@
 
 
-    # CHECK, IF USER PROVIDES OWN FILE CONNECTION FILE
- if [[ -f .palm.iofiles ]]
- then
-
-       # CHECK VERSION MISMATCH
-       # RESTART RUNS DON'T REQUIRE A CHECK, BECAUSE THEY USE A COPY OF THAT
-       # FILE WHICH HAS ALREADY BEEN CHECKED WITHIN THE INITAL PALMRUN CALL
-    if [[ $running_in_batch_mode != true  &&  $restart_run != true ]]
-    then
-       if [[ $(head -n1 $fileconnection_file) != $(head -n1 .palm.iofiles) ]]
-       then
-          printf "\n\n  +++ WARNING: A file connection file has been found in your"
-          printf "\n               working directory, but its revision does not match"
-          printf "\n               the revision of the default (trunk) version."
-          printf "\n               You may need to update your connection file"
-          printf "\n               \"${working_directory}/.palm.iofiles\" !"
-       fi
-    fi
-
-    fileconnection_file=.palm.iofiles
-
- fi
-
-
-    # CHECK, IF FILE CONNECTION FILE EXISTS
- if [[ ! -f $fileconnection_file ]]
- then
-    printf "\n\n  +++ file connection file: "
-    printf "\n           $fileconnection_file"
-    printf "\n      does not exist"
-    locat=connect; exit  
- fi
-
-
     # CHECK, IF THE ACTIVATION_STRING_LIST HAS BEEN GIVEN
  if [[ "$activation_string_list" = "" ]]
@@ -705 +675 @@
  fi
 
+
+    # SET THE DEFAULT FILE CONNECTION FILE (WHICH IS IN THE REPOSITORY)
+ fileconnection_file=${source_path}/../SCRIPTS/.palm.iofiles
+
+    # CHECK, IF USER PROVIDES OWN FILE CONNECTION FILE
+ if [[ -f .palm.iofiles ]]
+ then
+
+       # CHECK VERSION MISMATCH
+       # RESTART RUNS DON'T REQUIRE A CHECK, BECAUSE THEY USE A COPY OF THAT
+       # FILE WHICH HAS ALREADY BEEN CHECKED WITHIN THE INITAL PALMRUN CALL
+    if [[ $running_in_batch_mode != true  &&  $restart_run != true ]]
+    then
+       if [[ $(head -n1 $fileconnection_file) != $(head -n1 .palm.iofiles) ]]
+       then
+          printf "\n\n  +++ WARNING: A file connection file has been found in your"
+          printf "\n               working directory, but its revision does not match"
+          printf "\n               the revision of the default (trunk) version."
+          printf "\n               You may need to update your connection file"
+          printf "\n               \"${working_directory}/.palm.iofiles\" !"
+       fi
+    fi
+
+    fileconnection_file=.palm.iofiles
+
+ fi
+
+
+    # CHECK, IF FILE CONNECTION FILE EXISTS
+ if [[ ! -f $fileconnection_file ]]
+ then
+    printf "\n\n  +++ file connection file: "
+    printf "\n           $fileconnection_file"
+    printf "\n      does not exist"
+    locat=connect; exit  
+ fi