Changeset 30410 for other-projects

Timestamp:

2016-03-16T19:46:02+13:00 (8 years ago)

Author:

ak19

Message:

Finally got the upload of the binary to turn up.

File:

• other-projects/expeditee-release-kits/process_incoming.sh (modified) (5 diffs)

other-projects/expeditee-release-kits/process_incoming.sh

@@ -3 +3 @@
 # This script is for use on the machine where the nightly Expeditee binaries are to be 
 # uploaded. Put this script in the same folder as the uploads are meant to go.
-# When any binary or its log *.out file is being uploaded via secure shell, this script
-# will be called. The invocation of this script should go into .ssh/authorizedkeys.
-# Then this script will delete all other files in this folder that have the same naming
-# pattern as the uploaded binary/log file, excepting any existing file with the current
-# date in its name (in case this turns out to be the uploaded file itself).
+# When any binary's log *.out file is being uploaded via secure shell (which is fast), 
+# this script's called. The invocation of this script should go into .ssh/authorizedkeys.
+# Then this script will delete all other log and binary files in this folder for the same
+# os-release that are not of the current date (in case it's the uploaded file itself). 
+# The code didn't work if the binary was processed independent of the log file, since the 
+# bin's filename (and hence target os) could not be determined as it was still being 
+# uploaded.
 
 
-# http://stackoverflow.com/questions/1401482/yyyy-mm-dd-format-date-in-shell-script                                                                    
+# http://stackoverflow.com/questions/1401482/yyyy-mm-dd-format-date-in-shell-script
 date=`date +%Y-%m-%d`
 
@@ -18 +20 @@
 #incoming_file=$1
 incoming_file=`ls -rt *$date* 2>/dev/null | tail -n 1`
-echo $incoming_file
+#echo "Hello world. Incoming file: $incoming_file" >> out.txt
 
 # arrays
 # make sure -linux64 comes before linux, because we'll be matching against these 
 # strings, so need the longest strings to be matched first.
-bin_suffix=("-linux64" "-linux" "-windows.exe" "-MacOS-intel-MountainLion.dmg")
 rke_suffix=("-linux64" "-linux" "-windows" "-mac-MountainLion")
-
+os_substr=("-linux64" "-linux" "-windows" "-MountainLion")
+#bin_suffix=("-linux64" "-linux" "-windows.exe" "-MacOS-intel-MountainLion.dmg")
 
 # http://stackoverflow.com/questions/2172352/in-bash-how-can-i-check-if-a-string-begins-with-some-value
@@ -63 +65 @@
 
     shopt -u nullglob
-fi
 
-# binaries start with "Expeditee-1-"
-bin_file_pattern=
-if [[ $incoming_file == "Expeditee-"* ]] ; then
-    for suffix in ${bin_suffix[@]}; do
-    if [[ $incoming_file == *"$suffix" ]]; then
-        bin_file_pattern="Expeditee-1-*$suffix"
+    # We now know the OS for the binary associated with the rke log 
+    # that's being uploaded too. Delete all bins for this OS except
+    # any with the current date.
+
+    bin_file_pattern=
+    # binaries start with "Expeditee-1-"
+    for os_str in ${os_substr[@]}; do
+    if [[ $incoming_file == *"$os_str"* ]]; then
+        bin_file_pattern="Expeditee-1-*$os_str*"
         break
     fi
     done
-
+    
     # ONE WAY:
     #echo "found $bin_file_pattern"
     # -f to make it silent: will also be silent if there's nothing to rm
     #rm -rf $bin_file_pattern
-
+    
     # OR:
     # get rid of all files of the pattern that are not of the current date
@@ -87 +91 @@
     for file in ${files[@]}; do
     # set nullglob earlier, so won't be here if there's no file that matched
-    if [[ $file != "Expeditee-1-$date$suffix" ]]; then
-        echo "$file"
+    if [[ $file != *"$date"* ]] || [[ $file != *"$os_str"* ]]; then
+        echo "$file"        
         rm -rf $file
     fi
@@ -95 +99 @@
 fi
 
+
 # clean up ._Expeditee-1-YYYY-MM-DD-MacOS-intel-MountainLion.dmg temp files
 #ls -la "._Expeditee*dmg"