roberto/PiGarden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corretto problema sull'invio identificativo installazione per uso statistico

Browse Source
This commit is contained in:
lejubila
2017-06-14 17:38:47 +02:00
parent f58b2ba7fb
commit 02cde84392
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
piGarden.sh
View File

@@ -1464,20 +1464,23 @@ function send_identifier {
local FILE_ID="/tmp/pigarden.id" local FILE_ID="/tmp/pigarden.id"
if [ -f "$FILE_ID" ]; then if [ -f "$FILE_ID" ]; then
# Se il file è più vecchio di un giorno esce # Se il file non è più vecchio di un giorno esce
local max_age_file=86400 local max_age_file=86400
local time_file=`$STAT -c %Y "$FILE_ID"` local time_file=`$STAT -c %Y "$FILE_ID"`
local age_file=$((`date +"%s"` - $time_file )) local age_file=$((`date +"%s"` - $time_file ))
#log_write "age_file=$age_file - max_age_file=$max_age_file"
if [ "$age_file" -lt "$max_age_file" ]; then if [ "$age_file" -lt "$max_age_file" ]; then
#log_write "Id troppo giovane ($age_file) esce e non esegue l'invio"
return return
fi fi
else
local ID=`ifconfig | $GREP --color=never -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}' | head -1 | md5sum | $CUT -d" " -f 1`
if [ -z "$ID" ]; then
return;
fi
echo "$ID" > "$FILE_ID"
fi fi
local ID=`ifconfig | $GREP --color=never -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}' | head -1 | md5sum | $CUT -d" " -f 1`
if [ -z "$ID" ]; then
return;
fi
echo "$ID" > "$FILE_ID"
log_write "Send installation identifier to collect usage"
$CURL https://www.lejubila.net/statistic/collect_usage/piGarden/$ID/$VERSION/$SUB_VERSION/$RELEASE_VERSION > /dev/null 2>&1 $CURL https://www.lejubila.net/statistic/collect_usage/piGarden/$ID/$VERSION/$SUB_VERSION/$RELEASE_VERSION > /dev/null 2>&1
@@ -1493,7 +1496,7 @@ function debug2 {
VERSION=0 VERSION=0
SUB_VERSION=4 SUB_VERSION=4
RELEASE_VERSION=0 RELEASE_VERSION=1
DIR_SCRIPT=`dirname $0` DIR_SCRIPT=`dirname $0`
NAME_SCRIPT=${0##*/} NAME_SCRIPT=${0##*/}