Changeset 3270 for lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/bin/confirmator

Timestamp:

Jan 12, 2017, 1:26:17 PM (4 years ago)

Author:

mabarracus

Message:

Fix bug into confirmator

File:

• lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/bin/confirmator (modified) (3 diffs)

lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/bin/confirmator

@@ -1 +1 @@
 #!/bin/bash
-
+PARAM="$1"
 ACK_FILE=/etc/lliurex-analytics/status
 
@@ -75 +75 @@
 fi
 
-RUN_AS_CLIENT=$(${LLIUREX_VERSION} |${GREP} -i -o client)
-RUN_AS_SERVER=$(${LLIUREX_VERSION} |${GREP} -i -o server)
+RUN_AS_CLIENT=$(${LLIUREX_VERSION} |${GREP} -i -o client|uniq)
+RUN_AS_SERVER=$(${LLIUREX_VERSION} |${GREP} -i -o server|uniq)
 RUN_AS_DESKTOP=""
 if [ -z "${RUN_AS_CLIENT}" -a -z "${RUN_AS_SERVER}" ];then
@@ -89 +89 @@
 
 LOCAL_ACKNOWLEDGE="$(${CAT} ${ACK_FILE}|${GREP} -E -i -o 'yes|no')"
+# IF ALREADY ACCEPTED OR DENIED AND IS NOT FORCED EXECUTION AFTER CHECK SERVER OVERRIDE WE CAN EXIT AT THIS POINT
+if [ -n "${LOCAL_ACKNOWLEDGE}" -a "${PARAM}" != "-f" ]; then
+    exit 0
+fi
 
 DEBCONF_ACKNOWLEDGE="$(echo get lliurex-statistics/acknowledge|${DEBCONF_COMM} 2>/dev/null |${GREP} -E -i -o 'true|false')"