diff options
| author | robocoder <anthon.pang@gmail.com> | 2009-07-01 08:32:42 +0400 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2009-07-01 08:32:42 +0400 |
| commit | 1de95dc8bb7aa3e0690fa73346ae23e5001c50ed (patch) | |
| tree | 7fed7b5e3abba0a4efedf5ab31657e09c4ff0377 /misc/cron/archive.sh | |
| parent | 4418a57ab10fca414e64a8aa0741735703cedbf8 (diff) | |
Fixes #831 - check for alternate php binary; also simplify retrieval of token_auth for sh lacking substring replacement
git-svn-id: http://dev.piwik.org/svn/trunk@1267 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'misc/cron/archive.sh')
| -rw-r--r-- | misc/cron/archive.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/misc/cron/archive.sh b/misc/cron/archive.sh index 585c3c8f23..74c2935a6d 100644 --- a/misc/cron/archive.sh +++ b/misc/cron/archive.sh @@ -19,7 +19,10 @@ # time_before_archive_considered_outdated = 3600 # enable_browser_archiving_triggering = false -PHP_BIN=`which php5` +PHP_BIN=`which php5 2>/dev/null` +if test -z $PHP_BIN; then + PHP_BIN=`which php` +fi PIWIK_CRON_FOLDER=`dirname $(readlink -f ${0})` PIWIK_PATH="$PIWIK_CRON_FOLDER"/../../index.php PIWIK_CONFIG="$PIWIK_CRON_FOLDER"/../../config/config.ini.php @@ -27,9 +30,8 @@ PIWIK_CONFIG="$PIWIK_CRON_FOLDER"/../../config/config.ini.php PIWIK_SUPERUSER=`sed '/^\[superuser\]/,$!d;/^login[ \t]*=[ \t]*"*/!d;s///;s/"*[ \t]*$//;q' $PIWIK_CONFIG` PIWIK_SUPERUSER_MD5_PASSWORD=`sed '/^\[superuser\]/,$!d;/^password[ \t]*=[ \t]*"*/!d;s///;s/"*[ \t]*$//;q' $PIWIK_CONFIG` -CMD_TOKEN_AUTH="$PHP_BIN $PIWIK_PATH -- module=API&method=UsersManager.getTokenAuth&userLogin=$PIWIK_SUPERUSER&md5Password=$PIWIK_SUPERUSER_MD5_PASSWORD&format=php" -CMD_TOKEN_AUTH_RESULT=`$CMD_TOKEN_AUTH` -TOKEN_AUTH=${CMD_TOKEN_AUTH_RESULT:6:32} +CMD_TOKEN_AUTH="$PHP_BIN $PIWIK_PATH -- module=API&method=UsersManager.getTokenAuth&userLogin=$PIWIK_SUPERUSER&md5Password=$PIWIK_SUPERUSER_MD5_PASSWORD&format=php&serialize=0" +TOKEN_AUTH=`$CMD_TOKEN_AUTH` for period in day week year; do CMD="$PHP_BIN $PIWIK_PATH -- module=API&method=VisitsSummary.getVisits&idSite=all&period=$period&date=last52&format=xml&token_auth=$TOKEN_AUTH"; |