Changeset 29998

Timestamp:

2015-06-30T18:01:24+12:00 (9 years ago)

Author:

ak19

Message:

Corrections to make_latest function.

File:

• other-projects/nightly-tasks/crons-and-scripts/do-snapshots-and-latest.sh (modified) (2 diffs)

other-projects/nightly-tasks/crons-and-scripts/do-snapshots-and-latest.sh

@@ -167 +167 @@
     echo ""
     #echo "In MAKE_LATEST"
+
+    # Using local variable to loop through files, seen in http://mywiki.wooledge.org/ParsingLs
+    local latest
+    local file
+    local suffix
     
     # find the latest file in caveat, since this script is called upon each upload to puka's caveat
     # http://stackoverflow.com/questions/5885934/bash-function-to-find-newest-file-matching-pattern
     # http://mywiki.wooledge.org/BashFAQ/003
+    # http://tldp.org/LDP/abs/html/fto.html, where f1 -nt f2 means file f1 is newer than file f2 
+    # http://superuser.com/questions/687523/get-the-last-file-name-in-a-variable-in-bash
+
     unset -v latest
-    for file in "${caveat_dir}"*; do
-    [[ -f $file ]] && [[ $file -nt $latest ]] && latest=$file
+    #for file in "${caveat_dir}"*; do
+    #then file would be the full path. Instead, cd into the caveat dir to just get the filename
+    cd $caveat_dir
+    for file in *; do
+    [[ -f $file ]] && [[ "$file" != *"latest-server.exe" ]] && [[ "$file" != *"Greenstone3-latest-source.tar.gz" ]] && [[ $file -nt $latest ]] && latest=$file
     done
+    cd -
 
     # latest will not be undef, because this script is only ever called upon a legitimate
     # file upload into puka's caveat-emptor location    
-    # E.g. for testing, latest=Greenstone-3.07-candidate-2015.06.26-linux    
+    # E.g. for testing, latest=Greenstone-3.07-candidate-2015.06.30-linux-x64
     echo "Latest file in caveat is: $latest"
 
@@ -211 +223 @@
 
         # make a hardlink of the $latest file into the caveat_latest folder
+        echo "Making a hardlink to ${caveat_dir}$latest in ${latest_dir}$latest"
         ln ${caveat_dir}$latest ${latest_dir}$latest
     #else