Changeset 4443 for palm/trunk/SCRIPTS/batch_scp

Timestamp:

Mar 5, 2020 3:31:21 PM (4 years ago)

Author:

raasch

Message:

add cycle number to initial files too (000), remove compatibility for cycle numbers which are less than three digits wide

File:

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

palm/trunk/SCRIPTS/batch_scp

@@ -27 +27 @@
 # -----------------
 # $Id$
+# add cycle number to initial files too (000),
+# remove compatibility for cycle numbers which are less than three digits wide
+# 
+# 3549 2018-11-21 15:44:44Z raasch
 # english translation of german comments / variable names
 # 
@@ -427 +431 @@
           then
              (( maxcycle = icycle ))
-
-                 # FOR COMPATIBILITY REASONS WITH OLDER VERSIONS
-                 # CHECK IF CYCLE NUMBER CONTAINS LEADING ZEROS
-              if [[ $(echo $cycle | cut -c1) = 0 ]]
-              then
-                 leading_zero=true
-              else
-                 leading_zero=false
-              fi
           fi
 
@@ -464 +459 @@
                    (( maxcycle = usecycle ))
                 else
-                    printf "  >>> Unfied cycle number cannot be used\n"
+                    printf "  >>> Unified cycle number cannot be used\n"
                 fi
              fi
-             cyclestring=`printf ".%03d" $maxcycle`
-          else
-             if (( maxcycle == 0 ))
-             then
-                cyclestring=""
-             else
-                cyclestring=`printf ".%03d" $maxcycle`
-             fi
-          fi
+          fi
+          cyclestring=`printf ".%03d" $maxcycle`
        else
           if [[ $overwrite = false ]]
@@ -487 +475 @@
        if [[ $absolut = false ]]
        then
-          if (( maxcycle == 0 ))
-          then
-             cyclestring=""
-          else
-
-                # MAKE CYCLE NUMBER THREE DIGITS WIDE
-             if [[ $leading_zero = true ]]
-             then
-                cyclestring=`printf ".%03d" $maxcycle`
-             else
-                cyclestring=.$maxcycle
-             fi
-             (( maxcycle = 0 ))
-          fi
+             # MAKE CYCLE NUMBER THREE DIGITS WIDE
+          cyclestring=`printf ".%03d" $maxcycle`
        else
           cyclestring=""
@@ -511 +487 @@
     then
        (( maxcycle = usecycle ))
-       cyclestring=`printf ".%03d" $usecycle`
-    else
-       cyclestring=""
-    fi
+    fi
+    cyclestring=`printf ".%03d" $maxcycle`
 
        # EXIT, IF FILE SHALL BE GET FROM THE TARGET HOST, BUT DOESN'T EXIST
@@ -526 +500 @@
 
 
-    # IF A FOLDER IS CREATED, THE FILENAME MUST NOT CONTAIN A CYCLE NUMBER IN
-    # ANY CASE, SINCE IT CANNOT HAVE ONE
- if [[ $make_catalog = force ]]
- then
-    cyclestring=""
-    (( maxcycle = 0 ))
- fi
-
- 
     # IF NAME-OPTION (-n) IS CHOSEN, ONLY DETERMINE THE LOCAL FILENAME ON THE
     # TARGET HOST AND EXIT THE SCRIPT
@@ -630 +595 @@
           if [[ $? != 0 ]]
           then
-                # CHECK, OB IF FILE SIZES ON LOCAL HOST AND TARGET HOST MATCH
+                # CHECK, IF FILE SIZES ON LOCAL HOST AND TARGET HOST MATCH
              local_size=`ls -al  $2`
              local_size=`echo $local_size | cut -d" " -f5`