--- trunk/pkgtools/up2date.sh 2013/04/02 08:31:15 2105 +++ trunk/pkgtools/up2date.sh 2013/05/13 11:35:14 2106 @@ -4,7 +4,7 @@ source /usr/lib/mage/smage2.functions.sh # timeout in seconds -LYNX_CONNECT_TIMEOUT=30 +LYNX_CONNECT_TIMEOUT=10 ## only for tests -> normally in /etc/rc.d/init.d/functions COLRED="\033[1;6m\033[31m" @@ -81,10 +81,20 @@ case ${suffix} in tbz2|tgz) - grep "\(\.${suffix}\)\(\$\|\#\)" | sed -n "s/.*-\(.*\)\(\.${suffix}\).*/\1/;$ p" + if [[ ! -z ${UP2EXCLUDE} ]] + then + grep "\(\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed -n "s/.*-\(.*\)\(\.${suffix}\).*/\1/;$ p" + else + grep "\(\.${suffix}\)\(\$\|\#\)" | sed -n "s/.*-\(.*\)\(\.${suffix}\).*/\1/;$ p" + fi ;; *) - grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | sed -n "s/.*-\(.*\)\(\.tar\.${suffix}\).*/\1/;$ p" + if [[ ! -z ${UP2EXCLUDE} ]] + then + grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed -n "s/.*-\(.*\)\(\.tar\.${suffix}\).*/\1/;$ p" + else + grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | sed -n "s/.*-\(.*\)\(\.tar\.${suffix}\).*/\1/;$ p" + fi ;; esac } @@ -96,10 +106,20 @@ case ${suffix} in tbz2|tgz) - grep "\(\.${suffix}\)\(\$\|\#\)" | sed "s/.*-\(.*\)\(\.${suffix}\).*/\1/;q" + if [[ ! -z ${UP2EXCLUDE} ]] + then + grep "\(\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed "s/.*-\(.*\)\(\.${suffix}\).*/\1/;q" + else + grep "\(\.${suffix}\)\(\$\|\#\)" | sed "s/.*-\(.*\)\(\.${suffix}\).*/\1/;q" + fi ;; *) - grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | sed "s/.*-\(.*\)\(\.tar\.${suffix}\).*/\1/;q" + if [[ ! -z ${UP2EXCLUDE} ]] + then + grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | grep -v -- "${UP2EXCLUDE}" | sed "s/.*-\(.*\)\(\.tar\.${suffix}\).*/\1/;q" + else + grep "\(\.tar\.${suffix}\)\(\$\|\#\)" | sed "s/.*-\(.*\)\(\.tar\.${suffix}\).*/\1/;q" + fi ;; esac }