diff --git a/ChangeLog.txt b/ChangeLog.txt index 1505e91..40b929f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ -Current +Version 0.9.2 - 01/Aug/2013 + - allow to search the non $ARCH packages - speed up the update process - allow to disable the download status bar diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index 1505e91..40b929f 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,4 +1,5 @@ -Current +Version 0.9.2 - 01/Aug/2013 + - allow to search the non $ARCH packages - speed up the update process - allow to disable the download status bar diff --git a/src/repositories.txt b/src/repositories.txt index 434cdf7..ae5d77a 100644 --- a/src/repositories.txt +++ b/src/repositories.txt @@ -7,6 +7,9 @@ alienbob: http://taper.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0}/ restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0}/{x86,x86_64}/ slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0}/ zerouno: http://www.z01.eu/repo-slack/slackware64-current/ +mled: http://www.microlinux.fr/slackware/MLED-14.0-{32,64}bit/ +mles: http://www.microlinux.fr/slackware/MLES-14.0-{32,64}bit/ +msb: http://slackware.org.uk/msb/ Does NOT supports GPG salixos: http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/ @@ -40,6 +43,11 @@ slacky | X | | | | X | X | http://repository.s slacky | | X | | X | | X | http://repository.slacky.eu/slackware-14.0/ slacky | | X | | | X | X | http://repository.slacky.eu/slackware64-14.0/ zerouno | | | X | | X | X | http://www.z01.eu/repo-slack/slackware64-current/ +mled | | X | | X | | X | http://www.microlinux.fr/slackware/MLED-14.0-32bit/ +mled | | X | | | X | X | http://www.microlinux.fr/slackware/MLED-14.0-64bit/ +mles | | X | | X | | X | http://www.microlinux.fr/slackware/MLES-14.0-32bit/ +mles | | X | | | X | X | http://www.microlinux.fr/slackware/MLES-14.0-64bit/ +msb | | X | | X | X | X | http://slackware.org.uk/msb/ salixos | X | | | X | | | http://download.salixos.org/i486/13.37/ salixos | X | | | | X | | http://download.salixos.org/x86_64/13.37/ salixos | | X | | X | | | http://download.salixos.org/i486/14.0/ diff --git a/src/slackpkg+.SlackBuild b/src/slackpkg+.SlackBuild index 2550b3c..927196a 100644 --- a/src/slackpkg+.SlackBuild +++ b/src/slackpkg+.SlackBuild @@ -2,8 +2,8 @@ set -e -VERSION=0.9.1 -BUILD=2mt +VERSION=0.9.2 +BUILD=1mt CWD=`pwd` TMP=${TMP:-/tmp} diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 7d17f53..ef8ac70 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -306,7 +306,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then # First is the package already installed? # Amazing what a little sleep will do # exclusion is so much nicer :) - INSTPKG=$(ls -1 /var/log/packages | grep -e "^${BASENAME}-[^-]\+-\(${ARCH}\|fw\|noarch\)-[^-]\+") + INSTPKG=$(ls -1 /var/log/packages | grep -e "^${BASENAME}-[^-]\+-[^-]\+-[^-]\+") + #INSTPKG=$(ls -1 /var/log/packages | grep -e "^${BASENAME}-[^-]\+-\(${ARCH}\|fw\|noarch\)-[^-]\+") # INSTPKG is local version if [ ! "${INSTPKG}" = "" ]; then diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index 02fa982..026ebb3 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -30,7 +30,7 @@ REPOPLUS=( slackpkgplus alienbob restricted slacky ) # Slackware 14.0 - i386 MIRRORPLUS['alienbob']=http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.0/x86/ MIRRORPLUS['restricted']=http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.0/x86/ -MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware-14.0/ +#MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware-14.0/ # use this to keep updated the slackpkg+ package MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ @@ -48,6 +48,9 @@ MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ # restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0}/{x86,x86_64}/ # slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0}/ # zerouno: http://www.z01.eu/repo-slack/slackware64-current/ +# mled: http://www.microlinux.fr/slackware/MLED-14.0-{32,64}bit/ +# mles: http://www.microlinux.fr/slackware/MLES-14.0-{32,64}bit/ +# msb: http://slackware.org.uk/msb/ # # Does NOT supports GPG # salixos: http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/ diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index 7fe538c..c89968f 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -32,7 +32,7 @@ REPOPLUS=( slackpkgplus alienbob restricted slacky ) #MIRRORPLUS['multilib']=http://taper.alienbase.nl/mirrors/people/alien/multilib/14.0/ MIRRORPLUS['alienbob']=http://taper.alienbase.nl/mirrors/people/alien/sbrepos/14.0/x86_64/ MIRRORPLUS['restricted']=http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.0/x86_64/ -MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware64-14.0/ +#MIRRORPLUS['slacky']=http://repository.slacky.eu/slackware64-14.0/ # use this to keep updated the slackpkg+ package MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ @@ -52,6 +52,9 @@ MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/ # restricted: http://taper.alienbase.nl/mirrors/people/alien/restricted_sbrepos/{13.37,14.0}/{x86,x86_64}/ # slacky: http://repository.slacky.eu/slackware{,64}-{13.37,14.0}/ # zerouno: http://www.z01.eu/repo-slack/slackware64-current/ +# mled: http://www.microlinux.fr/slackware/MLED-14.0-{32,64}bit/ +# mles: http://www.microlinux.fr/slackware/MLES-14.0-{32,64}bit/ +# msb: http://slackware.org.uk/msb/ # # Does NOT supports GPG # salixos: http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/