Changeset 31961

Timestamp:

2017-09-11T17:24:43+12:00 (6 years ago)

Author:

ak19

Message:

Adding support in our automated daily GTI status emails for reporting translation files that are in SVN conflict. This is experiimental (untested) since nothing is presently in conflict. The need for the change became apparent when one translator-modified translation file was in conflict since late August and we weren't informed that it had been modified in our daily GTI status emails, since the script used to only report SVN modified and newly added files, not those whose svn status was marked as in conflict.

File:

• other-projects/gti/translation_status.sh (modified) (3 diffs)

other-projects/gti/translation_status.sh

@@ -31 +31 @@
 num_modified=0
 num_added=0
+num_conflict=0
 
 # in the lines returned from the diff, test for archives or newline
@@ -80 +81 @@
 echo "---------------------------------------------" >> $report
 
+
+# repeat again, this time looking for any files in conflict
+for file in ${filelisting[@]}; do
+    status=`svn status $file`
+    if [[ "$status" == *"C "* ]]; then
+        #echo "$file is in conflict: $status"                                                                                                                                                           
+        echo $status >> $report
+        ((num_conflict++))
+    fi
+done
+
+if [[ $num_conflict == 0 ]]; then
+    echo "No files in conflict" >> $report
+    echo "---------------------------------------------" >> $report
+else
+    echo "" >> $report
+    echo "The above $num_conflict files were IN CONFLICT." >> $report
+    echo "---------------------------------------------" >> $report
+fi
+
+
+
+
 # restore IFS
 IFS=$IFS_BAK
@@ -89 +113 @@
 if [[ $num_modified != 0 || $num_added != 0 ]]; then
 #  echo "Files were modified or added. Sending email..."  
-    cat $report | mail -s 'GTI: '$num_modified/$num_added' language file(s) on gti (nzdl) have been updated/added' $GREENSTONE_EMAIL
+    cat $report | mail -s 'GTI: '$num_modified/$num_added/$num_conflict' language file(s) on gti (nzdl) have been updated/added or conflict' $GREENSTONE_EMAIL
+    echo "Sent mail of report: $report"
+elif [[ $num_conflict != 0 ]]; then
+#  echo "Files were modified or added. Sending email..."  
+    cat $report | mail -s 'GTI: '$num_conflict' language file(s) on gti (nzdl) are IN CONFLICT' $GREENSTONE_EMAIL
     echo "Sent mail of report: $report"
 else