- don't force 1h if no time found, use only larger value! rel. 9

Changed files:
    php-dirs.spec -> 1.20
    php-session.sh -> 1.6

diff --git a/php-dirs.spec b/php-dirs.spec
index ab97e98bfe8125580876331f58227a952f9e65ee..7c63d570fc6fa94e8844a92320ff8d4b06c49e4f 100644 (file)
--- a/php-dirs.spec
+++ b/php-dirs.spec
@@ -2,7 +2,7 @@ Summary:        Common dirs for different PHP versions
 Summary(pl.UTF-8):     Wspólne katalogi dla różnych wersji PHP
 Name:          php-dirs
 Version:       1.1
-Release:       8
+Release:       9
 License:       GPL
 Group:         Base
 Source0:       php-session.sh

diff --git a/php-session.sh b/php-session.sh
index bf3000127db431175724b922b6f9674df8527ffd..46a2c019e618befd9d42e5a3b265258549be2952 100644 (file)
--- a/php-session.sh
+++ b/php-session.sh
@@ -14,12 +14,8 @@ elif [ -r /etc/php4/php.ini ]; then
        RUNTIME4=$(awk -F"=" '/^session.gc_maxlifetime[ \t]*=/ { t=sprintf("%d", ($2/3600)); if (t<1) { t=1; }; print t; exit;}' /etc/php4/php.ini)
 fi
 
-[ -z "$RUNTIME5" ] && RUNTIME5="1h"
+[ -z "$RUNTIME5" ] && [ -z "$RUNTIME4" ] && exit
 
-if [ -n "$RUNTIME5" ]; then
-       /usr/sbin/tmpwatch ${RUNTIME5} /var/run/php
-fi
+[ "${RUNTIME4:-0}" -ge "${RUNTIME5:-0}" ] && RUNTIME=$((RUNTIME4)) || RUNTIME=$((RUNTIME5))
 
-if [ -n "$RUNTIME4" -a "$RUNTIME5" != "$RUNTIME4" ]; then
-       /usr/sbin/tmpwatch ${RUNTIME4} /var/run/php
-fi
+/usr/sbin/tmpwatch ${RUNTIME} /var/run/php