diff options
Diffstat (limited to 'update_apt-panopticon')
| -rwxr-xr-x | update_apt-panopticon | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/update_apt-panopticon b/update_apt-panopticon index dde18a5..384ebdb 100755 --- a/update_apt-panopticon +++ b/update_apt-panopticon | |||
| @@ -6,12 +6,12 @@ PANOPATH="/var/www/html/apt-panopticon" | |||
| 6 | cd ${PANOPATH}/apt-panopticon_cgp | 6 | cd ${PANOPATH}/apt-panopticon_cgp |
| 7 | if [ -d .git ] ; then | 7 | if [ -d .git ] ; then |
| 8 | git pull > /dev/null | 8 | git pull > /dev/null |
| 9 | chown -R www-data:www-data * | 9 | chown -hR www-data:www-data * |
| 10 | fi | 10 | fi |
| 11 | cd ${PANOPATH}/apt-panopticon | 11 | cd ${PANOPATH}/apt-panopticon |
| 12 | if [ -d .git ] ; then | 12 | if [ -d .git ] ; then |
| 13 | git pull > /dev/null | 13 | git pull > /dev/null |
| 14 | chown -R www-data:www-data * | 14 | chown -hR www-data:www-data * |
| 15 | fi | 15 | fi |
| 16 | 16 | ||
| 17 | # Check if the lock file still exists. | 17 | # Check if the lock file still exists. |
| @@ -42,14 +42,14 @@ if [ "z" != "z${KEEPDAYS}" ] ; then | |||
| 42 | fi | 42 | fi |
| 43 | 43 | ||
| 44 | rm ../results; ln -s apt-panopticon/results_old ../results | 44 | rm ../results; ln -s apt-panopticon/results_old ../results |
| 45 | flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0 --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock | 45 | flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0s --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock |
| 46 | if [ -f apt-panopticon.lock ] ; then | 46 | if [ -f apt-panopticon.lock ] ; then |
| 47 | echo "apt-panopticon timed out." | 47 | echo "apt-panopticon timed out." |
| 48 | ./laggers | 48 | ./laggers |
| 49 | fi | 49 | fi |
| 50 | rm ../results; ln -s apt-panopticon/results ../results | 50 | rm ../results; ln -s apt-panopticon/results ../results |
| 51 | 51 | ||
| 52 | chown -R www-data:www-data * | 52 | chown -hR www-data:www-data * |
| 53 | 53 | ||
| 54 | # Clean up any mess left over from THIS failed run. | 54 | # Clean up any mess left over from THIS failed run. |
| 55 | find results_* -maxdepth 2 ! -name "pkgmaster.devuan.org" -name "*.*" -type d -print0 | xargs -0rt /bin/rm -fr | 55 | find results_* -maxdepth 2 ! -name "pkgmaster.devuan.org" -name "*.*" -type d -print0 | xargs -0rt /bin/rm -fr |
