Ignore:
Timestamp:
Nov 30, 2016, 4:04:39 PM (3 years ago)
Author:
mabarracus
Message:

Add debug verbosity
Fixes confirmator logic
Fixes acl's

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/bin/confirmator

    r2948 r2962  
    1919fi     
    2020DPKG="$(${WHICH} dpkg)"
    21 GREP="$(${WHICH} grep)"
     21GREP="$(${WHICH} egrep)"
    2222
    2323if [ -z "${DPKG}" -o -z "${GREP}" ]; then
     
    6262
    6363# INSTALLATION TYPE DETECTION & ACKNOWLEDGE TYPES
    64 RUN_ON_LIVE="$(${FINDMNT} -P -t squashfs|${GREP} 'target="/rofs" source="/dev/loop"')"
     64RUN_ON_LIVE="$(${FINDMNT} -P -t squashfs|${GREP} -i 'target="/rofs" source="/dev/loop[0-9]?"')"
    6565
    6666if [ -n "${RUN_ON_LIVE}" ]; then
     
    7676fi
    7777
    78 #NOT USED INSIDE CONFIRMATOR, THIS LOGIC IS INTO COLLECTOR
    79 SERVER_OVERRRIDE="$(${N4DCLI} -h server -c VariablesManager -m get_variable -a 'STATS_ENABLED'|${GREP} -i yes)"
    80 if [ -n "${SERVER_OVERRIDE}" ]; then
    81     exit 0
     78RUN_AS_CLIENT=$(${LLIUREX_VERSION} |${GREP} -i client)
     79RUN_AS_SERVER=$(${LLIUREX_VERSION} |${GREP} -i server)
     80RUN_AS_DESKTOP=""
     81if [ -z ${RUN_AS_CLIENT} -a -z ${RUN_AS_SERVER} ];then
     82    RUN_AS_DESKTOP="yes"
     83else
     84    #NOT USED INSIDE CONFIRMATOR, THIS LOGIC IS INTO COLLECTOR AND WILL BE ACCEPTED NOT NEED WRITE THE LOCAL FILE
     85    SERVER_OVERRRIDE="$(${N4DCLI} -h server -c VariablesManager -m get_variable -a 'STATS_ENABLED'|${GREP} '1')"
     86    if [ -n "${SERVER_OVERRIDE}" ]; then
     87        exit 0
     88    fi
    8289fi
    8390
     
    8693DEBCONF_ACKNOWLEDGE="$(echo get lliurex-statistics/acknowledge|${DEBCONF_COMM} 2>/dev/null |${GREP} -E -i -o 'true|false')"
    8794
    88 # NOT NEEDED
    89 #RUN_AS_CLIENT=$(${LLIUREX_VERSION} |${GREP} -i client)
    90 #RUN_AS_SERVER=$(${LLIUREX_VERSION} |${GREP} -i server)
    91 #RUN_AS_DESKTOP=""
    92 #if [ -z ${RUN_AS_CLIENT} -a -z ${RUN_AS_SERVER} ];then
    93 #    RUN_AS_DESKTOP="yes"
    94 #fi
    9595
    9696# DIALOG FUNCTION
Note: See TracChangeset for help on using the changeset viewer.