From 9594a05f77e2b63432cf45c45aeea37340ad20b2 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Sun, 22 Jul 2018 12:15:40 +0200 Subject: [PATCH] Fix caching when repository returns 302 or uses HTTP/2 --- src/slackpkgplus.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 9eaa06c..6743801 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -423,7 +423,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then [ $SRCBASE != "ChangeLog.txt" ]||[ -z "$LEVEL" -o "$LEVEL" == "1" ]&&printf " File: %-20s -> %-20s .." "$CURREPO" "$SRCBASE" [ $VERBOSE -eq 3 ]&&echo -n " ($CACHEFILE) " if [ $TOCACHE -eq 1 ];then - curl --max-time 10 --location --head $SRCURL 2>/dev/null|grep -v -e ^Date: -e ^Set-Cookie: -e ^Expires: -e ^X-Varnish:|sed 's/ //' > $TMPDIR/cache.head + curl --max-time 10 --location --head $SRCURL 2>/dev/null|tac|sed '/^HTTP/q'|tac|grep -v -i -e ^Date: -e ^Set-Cookie: -e ^Expires: -e ^X-Varnish:|sed 's/ //' > $TMPDIR/cache.head echo "Url: $SRCURL" >> $TMPDIR/cache.head [ $VERBOSE -eq 3 ]&&(echo;cat $TMPDIR/cache.head|sed 's/^/ /') if grep -q "^HTTP/.* 404" $TMPDIR/cache.head;then @@ -449,7 +449,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then $CACHEDOWNLOADER $1 $SRCURL ERR=$? echo - if [ "$(ls -l $1 2>/dev/null|awk '{print $5}')" == "$(grep Content-Length: $TMPDIR/cache.head|awk '{print $2}')" ];then + if [ "$(ls -l $1 2>/dev/null|awk '{print $5}')" == "$(grep -i Content-Length: $TMPDIR/cache.head|awk '{print $2}')" ];then cp $1 $CACHEDIR/$CACHEFILE 2>/dev/null cp $TMPDIR/cache.head $CACHEDIR/$CACHEFILE.head 2>/dev/null fi