From 98eab695c8cfeba388eb02e4e4bf9fe957960a6d Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Wed, 6 Jan 2016 01:42:15 +0100 Subject: [PATCH] Updated repositories.lst --- src/repositories.lst | 8 ++++++++ src/slackpkgplus.sh | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/repositories.lst b/src/repositories.lst index f0f2b21..5727cbb 100644 --- a/src/repositories.lst +++ b/src/repositories.lst @@ -95,3 +95,11 @@ http://www.microlinux.fr/microlinux/server-14.2-32bit http://www.microlinux.fr/microlinux/server-14.2-64bit yes yes Niki Kovacs http://www.slackel.gr/repo/i486/current yes yes Dimitris Tzemos (Slackel Creator) http://www.slackel.gr/repo/x86_64/current yes yes Dimitris Tzemos (Slackel Creator) +http://slackware.osuosl.org/slackware-13.37 yes yes Slackware Linux Project +http://slackware.osuosl.org/slackware-14.0 yes yes Slackware Linux Project +http://slackware.osuosl.org/slackware64-13.37 yes yes Slackware Linux Project +http://slackware.osuosl.org/slackware64-14.0 yes yes Slackware Linux Project +http://slackware.osuosl.org/slackware-14.1 yes yes Slackware Linux Project +http://slackware.osuosl.org/slackware-current yes yes Slackware Linux Project +http://slackware.osuosl.org/slackware64-14.1 yes yes Slackware Linux Project +http://slackware.osuosl.org/slackware64-current yes yes Slackware Linux Project diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index d56d937..0c83a64 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -364,7 +364,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then CURREPO=slackware fi - echo echo -n " File: $CURREPO->$SRCBASE .." [ $VERBOSE -eq 3 ]&&echo -n " ($CACHEFILE) " if [ $TOCACHE -eq 1 ];then @@ -388,6 +387,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then echo " Downloading... " # ... -> needed # ... .. -> re-needed $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 cp $1 $CACHEDIR/$CACHEFILE cp $TMPDIR/cache.head $CACHEDIR/$CACHEFILE.head @@ -396,8 +396,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then echo " Downloading..." # .. -> tocache=0 $CACHEDOWNLOADER $1 $SRCURL ERR=$? + echo fi - echo return $ERR } # END function cached_downloader()