mirror of
https://github.com/zuno/slackpkgplus
synced 2024-12-27 09:58:34 +01:00
Slackpkg+ 0.9.4 Released
all contributes from phenixia2003 on LQ
Version 0.9.4 - 27/Aug/2013
- fixed a issue when a pattern is used multiple times in argument
- fixed a bug in install/upgrade regarding the enhanced priority
- fixed a bug in search which leads to wrong information about upgrade
- allow to to install/upgrade/reinstall/remove all the packages from
a given repository (thanks to phenixia2003 for big patch)
This commit is contained in:
Matteo Rossini
parent
a555a79950
commit
dd5e73aca3
7 changed files with 104 additions and 19 deletions
|
|
@ -1,3 +1,10 @@
|
|||
Version 0.9.4 - 27/Aug/2013
|
||||
- fixed a issue when a pattern is used multiple times in argument
|
||||
- fixed a bug in install/upgrade regarding the enhanced priority
|
||||
- fixed a bug in search which leads to wrong information about upgrade
|
||||
- allow to to install/upgrade/reinstall/remove all the packages from
|
||||
a given repository (thanks to phenixia2003 for big patch)
|
||||
|
||||
Version 0.9.3 - 25/Aug/2013
|
||||
- fixed md5 check (thanks to AlienBob)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
Version 0.9.4 - 27/Aug/2013
|
||||
- fixed a issue when a pattern is used multiple times in argument
|
||||
- fixed a bug in install/upgrade regarding the enhanced priority
|
||||
- fixed a bug in search which leads to wrong information about upgrade
|
||||
- allow to to install/upgrade/reinstall/remove all the packages from
|
||||
a given repository (thanks to phenixia2003 for big patch)
|
||||
|
||||
Version 0.9.3 - 25/Aug/2013
|
||||
- fixed md5 check (thanks to AlienBob)
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ 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/
|
||||
mles: http://www.microlinux.fr/slackware/MLWS-14.0-{32,64}bit/
|
||||
msb: http://slackware.org.uk/msb/
|
||||
|
||||
Does NOT supports GPG
|
||||
|
|
@ -51,6 +52,8 @@ mled | | X | | X | | X | http://www.microlin
|
|||
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/
|
||||
mlws | | X | | X | | X | http://www.microlinux.fr/slackware/MLWS-14.0-32bit/
|
||||
mlws | | X | | | X | X | http://www.microlinux.fr/slackware/MLWS-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/
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
set -e
|
||||
|
||||
VERSION=0.9.3
|
||||
VERSION=$(head -1 ChangeLog.txt|awk '{print $2}')
|
||||
BUILD=1mt
|
||||
|
||||
CWD=`pwd`
|
||||
|
|
|
|||
|
|
@ -332,14 +332,24 @@ function checkmd5() {
|
|||
# INSTPKG is local version
|
||||
if [ ! "${INSTPKG}" = "" ]; then
|
||||
|
||||
# If installed is it uptodate?
|
||||
if [ "${INSTPKG}" = "${RAWNAME}" ]; then
|
||||
STATUS=" installed "
|
||||
printf " %-16s %-24s %-40s \n" "$STATUS" "$REPO" "$INSTPKG"
|
||||
else
|
||||
STATUS="upgrade"
|
||||
printf " %-16s %-24s %-40s \n" "$STATUS" "$REPO" "$INSTPKG --> ${RAWNAME}"
|
||||
fi
|
||||
# INSTPKG can contains more than one package. But only those
|
||||
# that match the basename ${BASENAME} must be handled
|
||||
|
||||
for CINSTPKG in ${INSTPKG} ; do
|
||||
CBASENAME=$(echo "${CINSTPKG}" | rev | cut -f4- -d- | rev)
|
||||
|
||||
if [ "${CBASENAME}" == "${BASENAME}" ] ; then
|
||||
|
||||
# If installed is it uptodate?
|
||||
if [ "${CINSTPKG}" = "${RAWNAME}" ]; then
|
||||
STATUS=" installed "
|
||||
printf " %-16s %-24s %-40s \n" "$STATUS" "$REPO" "$CINSTPKG"
|
||||
else
|
||||
STATUS="upgrade"
|
||||
printf " %-16s %-24s %-40s \n" "$STATUS" "$REPO" "$CINSTPKG --> ${RAWNAME}"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
else
|
||||
printf " %-16s %-24s %-40s \n" "$STATUS" "$REPO" "${RAWNAME}"
|
||||
fi
|
||||
|
|
@ -389,6 +399,27 @@ function checkmd5() {
|
|||
[ ! -z "$PREFIX" ] && PRIORITY=( ${PREFIX[*]} ${PRIORITY[*]} )
|
||||
fi
|
||||
|
||||
# -- Ensures the internal blacklist is empty
|
||||
#
|
||||
echo -n "" > ${TMPDIR}/blacklist.slackpkgplus
|
||||
|
||||
# Adds the pattern given by $(1) into the internal blacklist
|
||||
# ${TMPDIR}/blacklist.slackpkgplus
|
||||
#
|
||||
# ($1) The pattern to add.
|
||||
#
|
||||
function internal_blacklist() {
|
||||
echo "$1" >> ${TMPDIR}/blacklist.slackpkgplus
|
||||
}
|
||||
|
||||
# Override original applyblackist() so that internal blacklist will
|
||||
# be applied too.
|
||||
#
|
||||
function applyblacklist() {
|
||||
grep -vEw -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus
|
||||
}
|
||||
|
||||
|
||||
if [ -z "$DOWNLOADER" ];then
|
||||
DOWNLOADER="wget --passive-ftp -O"
|
||||
fi
|
||||
|
|
@ -405,25 +436,60 @@ function checkmd5() {
|
|||
PRIORITYIDX=1
|
||||
|
||||
|
||||
|
||||
if [ "$CMD" == "install" ] || [ "$CMD" == "upgrade" ] ; then
|
||||
if [ "$CMD" == "install" ] || [ "$CMD" == "upgrade" ] || [ "$CMD" == "reinstall" ] || [ "$CMD" == "remove" ] ; then
|
||||
|
||||
NEWINPUTLIST=""
|
||||
PRIORITYLIST=""
|
||||
|
||||
for pref in $INPUTLIST ; do
|
||||
if echo "$pref" | grep -q "[a-zA-Z0-9]\+[:][a-zA-Z0-9]\+" ; then
|
||||
repository=$(echo "$pref" | cut -f1 -d":")
|
||||
package=$(echo "$pref" | cut -f2- -d":")
|
||||
|
||||
PRIORITY=( SLACKPKGPLUS_${repository}:$package ${PRIORITY[*]} )
|
||||
if [ "$CMD" == "install" ] || [ "$CMD" == "upgrade" ] ; then
|
||||
repository=$(echo "$pref" | cut -f1 -d":")
|
||||
package=$(echo "$pref" | cut -f2- -d":")
|
||||
|
||||
PRIORITYLIST=( ${PRIORITYLIST[*]} SLACKPKGPLUS_${repository}:$package )
|
||||
fi
|
||||
elif grep -q "^SLACKPKGPLUS_${pref}[ ]" ${WORKDIR}/pkglist ; then
|
||||
|
||||
if [ "$CMD" == "remove" ] && echo "$pref" | grep -qi "multilib" ; then
|
||||
internal_blacklist "glibc"
|
||||
internal_blacklist "gcc"
|
||||
fi
|
||||
|
||||
package="SLACKPKGPLUS_${pref}"
|
||||
PRIORITYLIST=( ${PRIORITYLIST[*]} SLACKPKGPLUS_${pref}:.* )
|
||||
else
|
||||
package=$pref
|
||||
package=$pref
|
||||
fi
|
||||
NEWINPUTLIST="$NEWINPUTLIST $package"
|
||||
|
||||
# -- only insert "package" if not in NEWINPUTLIST
|
||||
echo "$NEWINPUTLIST" | grep -qw "${package}" || NEWINPUTLIST="$NEWINPUTLIST $package"
|
||||
done
|
||||
|
||||
INPUTLIST=$NEWINPUTLIST
|
||||
|
||||
if [ ! -z "$PRIORITYLIST" ] ; then
|
||||
NEWPRIORITY=( ${PRIORITYLIST[*]} ${PRIORITY[*]} )
|
||||
unset PRIORITY
|
||||
|
||||
# -- This is to avoid duplicated priority rules in the variable
|
||||
# PRIORITY
|
||||
#
|
||||
for np in ${NEWPRIORITY[*]} ; do
|
||||
ADD_PRIORITY=true
|
||||
for cp in ${PRIORITY[*]} ; do
|
||||
if [ "$np" == "$cp" ] ; then
|
||||
ADD_PRIORITY=false
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if $ADD_PRIORITY ; then
|
||||
PRIORITY=( ${PRIORITY[*]} $np )
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$CMD" == "install-new" ] ; then
|
||||
|
|
|
|||
|
|
@ -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+/
|
||||
|
|
@ -50,6 +50,7 @@ MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/
|
|||
# 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/
|
||||
# mlws: http://www.microlinux.fr/slackware/MLWS-14.0-{32,64}bit/
|
||||
# msb: http://slackware.org.uk/msb/
|
||||
#
|
||||
# Does NOT supports GPG
|
||||
|
|
|
|||
|
|
@ -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+/
|
||||
|
|
@ -54,6 +54,7 @@ MIRRORPLUS['slackpkgplus']=http://slakfinder.org/slackpkg+/
|
|||
# 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/
|
||||
# mlws: http://www.microlinux.fr/slackware/MLWS-14.0-{32,64}bit/
|
||||
# msb: http://slackware.org.uk/msb/
|
||||
#
|
||||
# Does NOT supports GPG
|
||||
|
|
|
|||
Loading…
Reference in a new issue