From a758ab8c71036a3da02a40c28876896ae2b59e6f Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Wed, 20 Sep 2017 12:42:38 +0200
Subject: [PATCH] dataminer algorithms-updater: another attempt to fix the
 algorithms upgrade.

---
 .../dataminer_app/templates/algorithms-updater.j2      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/smartgears/dataminer_app/templates/algorithms-updater.j2 b/smartgears/dataminer_app/templates/algorithms-updater.j2
index b82a1451..26e83bc2 100644
--- a/smartgears/dataminer_app/templates/algorithms-updater.j2
+++ b/smartgears/dataminer_app/templates/algorithms-updater.j2
@@ -94,6 +94,7 @@ function algorithms_updater() {
             ALGO_LINE=$( egrep ^"$ALGO_NAME " $ALGORITHMS_INSTALLED_FILE )
             ALGO_PRESENT=$?
             if [ $ALGO_PRESENT -ne 0 ] ; then
+                echo "logger 'algorithms-updater: New algorithm $ALGO_NAME'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                 echo "logger 'algorithms-updater: running the add command of algorithm $ALGO_NAME'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                 echo "logger 'algorithms-updater: the add command string is $ALGO_BODY'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                 echo "RETVAL=" >> $ALGORITHMS_TEMP_SCRIPT.body_
@@ -110,8 +111,8 @@ function algorithms_updater() {
                 echo 'if [ $RETVAL -ne 0 ] ; then' >> $ALGORITHMS_TEMP_SCRIPT.body_
                 echo "    logger 'algorithms-updater: the adding of algorithm $ALGO_NAME failed'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                 echo "else" >> $ALGORITHMS_TEMP_SCRIPT.body_
-                echo "    echo 'egrep -v ^"$ALGO_NAME "  $ALGORITHMS_INSTALLED_FILE > ${ALGORITHMS_INSTALLED_FILE}_ " >> $ALGORITHMS_TEMP_SCRIPT.body_
-                echo "    echo 'mv ${ALGORITHMS_INSTALLED_FILE}_ $ALGORITHMS_INSTALLED_FILE" >> $ALGORITHMS_TEMP_SCRIPT.body_
+                echo "    'egrep -v ^\"$ALGO_NAME \"  $ALGORITHMS_INSTALLED_FILE > ${ALGORITHMS_INSTALLED_FILE}_'" >> $ALGORITHMS_TEMP_SCRIPT.body_
+                echo "    'mv ${ALGORITHMS_INSTALLED_FILE}_ $ALGORITHMS_INSTALLED_FILE'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                 echo "    echo '$ALGO_NAME | $ALGO_DATE' >> $ALGORITHMS_INSTALLED_FILE" >> $ALGORITHMS_TEMP_SCRIPT.body_
                 echo "    logger 'algorithms-updater: the adding of algorithm $ALGO_NAME succeeded'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                 echo "fi" >> $ALGORITHMS_TEMP_SCRIPT.body_
@@ -120,6 +121,7 @@ function algorithms_updater() {
                 ALGO_LOCAL_DATE=$( egrep ^"$ALGO_NAME " $ALGORITHMS_INSTALLED_FILE | tail -1 | awk -F \| '{ print $2 }' | grep -v \' )
                 ALGO_LOCAL_TIMESTAMP=$( date +%s -d "$ALGO_LOCAL_DATE" 2>/dev/null )
                 if [ $? -ne 0 ] || [ $ALGO_LOCAL_TIMESTAMP -ne $ALGO_TIMESTAMP ]; then
+                    echo "logger 'algorithms-updater: algorithm $ALGO_NAME is already present but a newer version exists'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                     echo "logger 'algorithms-updater: running the add command of algorithm $ALGO_NAME'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                     echo "logger 'algorithms-updater: the add command string is $ALGO_BODY'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                     echo "RETVAL=" >> $ALGORITHMS_TEMP_SCRIPT.body_
@@ -136,8 +138,8 @@ function algorithms_updater() {
                     echo 'if [ $RETVAL -ne 0 ] ; then' >> $ALGORITHMS_TEMP_SCRIPT.body_
                     echo "    logger 'algorithms-updater: the adding of algorithm $ALGO_NAME failed'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                     echo "else" >> $ALGORITHMS_TEMP_SCRIPT.body_
-                    echo "    echo 'egrep -v "^$ALGO_NAME "  $ALGORITHMS_INSTALLED_FILE > ${ALGORITHMS_INSTALLED_FILE}_ " >> $ALGORITHMS_TEMP_SCRIPT.body_
-                    echo "    echo 'mv ${ALGORITHMS_INSTALLED_FILE}_ $ALGORITHMS_INSTALLED_FILE" >> $ALGORITHMS_TEMP_SCRIPT.body_
+                    echo "    egrep -v \"^$ALGO_NAME \"  $ALGORITHMS_INSTALLED_FILE > ${ALGORITHMS_INSTALLED_FILE}_" >> $ALGORITHMS_TEMP_SCRIPT.body_
+                    echo "    mv ${ALGORITHMS_INSTALLED_FILE}_ $ALGORITHMS_INSTALLED_FILE" >> $ALGORITHMS_TEMP_SCRIPT.body_
                     echo "    echo '$ALGO_NAME | $ALGO_DATE' >> $ALGORITHMS_INSTALLED_FILE" >> $ALGORITHMS_TEMP_SCRIPT.body_
                     echo "    logger 'algorithms-updater: the adding of algorithm $ALGO_NAME succeeded'" >> $ALGORITHMS_TEMP_SCRIPT.body_
                     echo "fi" >> $ALGORITHMS_TEMP_SCRIPT.body_