From 4ac4c25009514a07b4ea2be20a45c922f878abfa Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Wed, 13 Jan 2016 16:48:38 +0100 Subject: [PATCH] Version 1.7.a4 - 12/Jan/2016 - Improved performance - Fixed search that may fails to detect repository in certain conditions - slackpkg search shows the repository name for the official repository --- ChangeLog.txt | 11 ++++++++--- src/ChangeLog.txt | 11 ++++++++--- src/slackpkgplus.sh | 16 ++++++++-------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 3cdd89c..e799294 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,14 +1,19 @@ -Version 1.7.a3 - 10/Jan/2015 +Version 1.7.a4 - 12/Jan/2016 + - Improved performance + - Fixed search that may fails to detect repository in certain conditions + - slackpkg search shows the repository name for the official repository + +Version 1.7.a3 - 10/Jan/2016 - Do not show notices when running slackpkg update or slackpkg check-updates (thanks to yars068) - Fixed a bug on x86 hosts when a repository contains also x86_64 packages -Version 1.7.a2 - 06/Jan/2015 +Version 1.7.a2 - 06/Jan/2016 - Remember user to (re)run 'slackpkg update gpg' - Fixed Download Only when upgrade base packages (aaa_base, pkgtools...) - Quick output on Cached Download -Version 1.7.a1 - 04/Jan/2015 +Version 1.7.a1 - 04/Jan/2016 It's the time for a stable version of slackpkg+. Currently it is just a development version to fix older feature and add/test new. I'll need more test possible to make it bugfree ;). diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index 3cdd89c..e799294 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,14 +1,19 @@ -Version 1.7.a3 - 10/Jan/2015 +Version 1.7.a4 - 12/Jan/2016 + - Improved performance + - Fixed search that may fails to detect repository in certain conditions + - slackpkg search shows the repository name for the official repository + +Version 1.7.a3 - 10/Jan/2016 - Do not show notices when running slackpkg update or slackpkg check-updates (thanks to yars068) - Fixed a bug on x86 hosts when a repository contains also x86_64 packages -Version 1.7.a2 - 06/Jan/2015 +Version 1.7.a2 - 06/Jan/2016 - Remember user to (re)run 'slackpkg update gpg' - Fixed Download Only when upgrade base packages (aaa_base, pkgtools...) - Quick output on Cached Download -Version 1.7.a1 - 04/Jan/2015 +Version 1.7.a1 - 04/Jan/2016 It's the time for a stable version of slackpkg+. Currently it is just a development version to fix older feature and add/test new. I'll need more test possible to make it bugfree ;). diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 81a759c..d78c63a 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -887,8 +887,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then for i in ${PRIORITY[@]}; do DIR="$i" - if [[ "$DIR" =~ ^[-_[:alnum:]]+[:] ]] ; then # was if echo "$DIR" | grep -q "[a-zA-Z0-9]\+[:]" ; then - DIR=${DIR/:*/} # was DIR=$(echo "$i" | cut -f1 -d":") + if [[ "$DIR" =~ ^[-_[:alnum:]]+[:] ]] ; then # was if echo "$DIR" | grep -q "[a-zA-Z0-9]\+[:]" ; then + DIR=${DIR/:*/} # was DIR=$(echo "$i" | cut -f1 -d":") fi if [ "$CMD" == "file-search" ] ; then @@ -917,13 +917,13 @@ if [ "$SLACKPKGPLUS" = "on" ];then fi while read PKG ; do - PKGDATA=( $PKG ) # PKGDATA([0]=DIR,[1]=BASENMAE,[5]=FULLNAME) + PKGDATA=( $PKG ) # PKGDATA([0]=DIR,[1]=BASENMAE,[5]=FULLNAME) - PKGDIR=${PKGDATA[0]} # was PKGDIR=$(echo "$PKG" | cut -f1 -d" ") - PKGBASENAME=${PKGDATA[1]} # was PKGBASENAME=$(echo "$PKG" | cut -f2 -d" ") - PKGFULLNAME=${PKGDATA[5]} # was PKGFULLNAME=$(echo "$PKG" | cut -f6 -d" ") + PKGDIR=${PKGDATA[0]} # was PKGDIR=$(echo "$PKG" | cut -f1 -d" ") + PKGBASENAME=${PKGDATA[1]} # was PKGBASENAME=$(echo "$PKG" | cut -f2 -d" ") + PKGFULLNAME=${PKGDATA[5]} # was PKGFULLNAME=$(echo "$PKG" | cut -f6 -d" ") - if [[ "$PKGDIR" =~ ^SLACKPKGPLUS_ ]] ; then # was if echo "$PKGDIR" | grep -q "SLACKPKGPLUS_" ; then + if [[ "$PKGDIR" =~ ^SLACKPKGPLUS_ ]] ; then # was if echo "$PKGDIR" | grep -q "SLACKPKGPLUS_" ; then grep -q "^repository:${PKGDIR}:basename:${PKGBASENAME}:" $PKGLIST && continue else grep -q ":basename:${PKGBASENAME}:" $PKGLIST && continue @@ -1178,7 +1178,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then - SPKGPLUS_VERSION="1.7.a3" + SPKGPLUS_VERSION="1.7.a4" VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION"