mirror of
https://github.com/zuno/slackpkgplus
synced 2025-01-13 20:01:04 +01:00
Only reindent.
This commit is contained in:
Matteo Rossini
parent
29722fe22e
commit
9eeb9fcbdd
1 changed files with 309 additions and 311 deletions
|
|
@ -26,13 +26,13 @@ if [ "$SLACKPKGPLUS" = "on" ];then
|
|||
PREPO=$(echo $URLFILE|sed -r 's#^.*/SLACKPKGPLUS_([^/]+)/.*$#\1#')
|
||||
URLFILE=$(echo $URLFILE|sed "s#^.*/SLACKPKGPLUS_$PREPO/#${MIRRORPLUS[$PREPO]}#")
|
||||
fi
|
||||
|
||||
|
||||
if echo $URLFILE | grep -q "^file://" ; then
|
||||
URLFILE=${URLFILE:6}
|
||||
if [ -f $URLFILE ];then
|
||||
cp -v $URLFILE $2
|
||||
cp -v $URLFILE $2
|
||||
else
|
||||
return 1
|
||||
return 1
|
||||
fi
|
||||
else
|
||||
$DOWNLOADER $2 $URLFILE
|
||||
|
|
@ -40,79 +40,79 @@ if [ "$SLACKPKGPLUS" = "on" ];then
|
|||
|
||||
if [ $(basename $1) = "MANIFEST.bz2" ];then
|
||||
if [ ! -s $2 ];then
|
||||
echo -n|bzip2 -c >$2
|
||||
echo -n|bzip2 -c >$2
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ $(basename $1) = "CHECKSUMS.md5.asc" ];then
|
||||
if [ "$CHECKGPG" = "on" ];then
|
||||
for PREPO in $REPOPLUS;do
|
||||
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5.asc
|
||||
if echo $URLFILE | grep -q "^file://" ; then
|
||||
URLFILE=${URLFILE:6}
|
||||
cp -v $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc
|
||||
else
|
||||
$DOWNLOADER ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc $URLFILE
|
||||
fi
|
||||
if [ $? -eq 0 ];then
|
||||
if [ $(checkgpg ${TMPDIR}/CHECKSUMS.md5-$PREPO) -ne 1 ];then
|
||||
echo
|
||||
echo " !!! F A T A L !!!"
|
||||
echo " Repository '$PREPO' FAILS to check CHECKSUMS.md5 signature"
|
||||
echo " The file may be corrupted or the gpg key may be not valid."
|
||||
echo " Remember to import keys launching 'slackpkg update gpg'."
|
||||
echo
|
||||
sleep 5
|
||||
echo > ${TMPDIR}/CHECKSUMS.md5
|
||||
fi
|
||||
else
|
||||
echo
|
||||
echo " !!! W A R N I N G !!!"
|
||||
echo " Repository '$PREPO' does NOT support signature checking"
|
||||
echo " You SHOULD disable GPG check by setting 'CHECKGPG=off'"
|
||||
echo " in /etc/slackpkg/slackpkg.conf"
|
||||
echo
|
||||
sleep 5
|
||||
fi
|
||||
done
|
||||
for PREPO in $REPOPLUS;do
|
||||
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5.asc
|
||||
if echo $URLFILE | grep -q "^file://" ; then
|
||||
URLFILE=${URLFILE:6}
|
||||
cp -v $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc
|
||||
else
|
||||
$DOWNLOADER ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc $URLFILE
|
||||
fi
|
||||
if [ $? -eq 0 ];then
|
||||
if [ $(checkgpg ${TMPDIR}/CHECKSUMS.md5-$PREPO) -ne 1 ];then
|
||||
echo
|
||||
echo " !!! F A T A L !!!"
|
||||
echo " Repository '$PREPO' FAILS to check CHECKSUMS.md5 signature"
|
||||
echo " The file may be corrupted or the gpg key may be not valid."
|
||||
echo " Remember to import keys launching 'slackpkg update gpg'."
|
||||
echo
|
||||
sleep 5
|
||||
echo > ${TMPDIR}/CHECKSUMS.md5
|
||||
fi
|
||||
else
|
||||
echo
|
||||
echo " !!! W A R N I N G !!!"
|
||||
echo " Repository '$PREPO' does NOT support signature checking"
|
||||
echo " You SHOULD disable GPG check by setting 'CHECKGPG=off'"
|
||||
echo " in /etc/slackpkg/slackpkg.conf"
|
||||
echo
|
||||
sleep 5
|
||||
fi
|
||||
done
|
||||
else
|
||||
checkgpg ${TMPDIR}/CHECKSUMS.md5 >/dev/null
|
||||
checkgpg ${TMPDIR}/CHECKSUMS.md5 >/dev/null
|
||||
fi
|
||||
fi
|
||||
if [ $(basename $1) = "ChangeLog.txt" ];then
|
||||
for PREPO in $REPOPLUS;do
|
||||
# Not all repositories have the ChangeLog.txt, so I use md5 of CHECKSUMS.md5 instead
|
||||
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5
|
||||
if echo $URLFILE | grep -q "^file://" ; then
|
||||
URLFILE=${URLFILE:6}
|
||||
cp -v $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO
|
||||
else
|
||||
$DOWNLOADER ${TMPDIR}/CHECKSUMS.md5-$PREPO ${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5
|
||||
fi
|
||||
echo $PREPO $(md5sum ${TMPDIR}/CHECKSUMS.md5-$PREPO|awk '{print $1}') >>$2
|
||||
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5
|
||||
if echo $URLFILE | grep -q "^file://" ; then
|
||||
URLFILE=${URLFILE:6}
|
||||
cp -v $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO
|
||||
else
|
||||
$DOWNLOADER ${TMPDIR}/CHECKSUMS.md5-$PREPO ${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5
|
||||
fi
|
||||
echo $PREPO $(md5sum ${TMPDIR}/CHECKSUMS.md5-$PREPO|awk '{print $1}') >>$2
|
||||
done
|
||||
fi
|
||||
if [ $(basename $1) = "GPG-KEY" ];then
|
||||
for PREPO in $REPOPLUS;do
|
||||
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY
|
||||
if echo $URLFILE | grep -q "^file://" ; then
|
||||
URLFILE=${URLFILE:6}
|
||||
cp -v $URLFILE $2-tmp
|
||||
else
|
||||
$DOWNLOADER $2-tmp ${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY
|
||||
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY
|
||||
if echo $URLFILE | grep -q "^file://" ; then
|
||||
URLFILE=${URLFILE:6}
|
||||
cp -v $URLFILE $2-tmp
|
||||
else
|
||||
$DOWNLOADER $2-tmp ${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY
|
||||
fi
|
||||
if [ $? -eq 0 ];then
|
||||
gpg --import $2-tmp
|
||||
else
|
||||
echo
|
||||
echo " !!! W A R N I N G !!!"
|
||||
echo " Repository '$PREPO' does NOT contain the GPG-KEY"
|
||||
echo " You SHOULD disable GPG check by setting 'CHECKGPG=off'"
|
||||
echo " in /etc/slackpkg/slackpkg.conf"
|
||||
echo
|
||||
sleep 5
|
||||
fi
|
||||
rm $2-tmp
|
||||
if [ $? -eq 0 ];then
|
||||
gpg --import $2-tmp
|
||||
else
|
||||
echo
|
||||
echo " !!! W A R N I N G !!!"
|
||||
echo " Repository '$PREPO' does NOT contain the GPG-KEY"
|
||||
echo " You SHOULD disable GPG check by setting 'CHECKGPG=off'"
|
||||
echo " in /etc/slackpkg/slackpkg.conf"
|
||||
echo
|
||||
sleep 5
|
||||
fi
|
||||
rm $2-tmp
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
|
@ -124,45 +124,43 @@ if [ "$SLACKPKGPLUS" = "on" ];then
|
|||
if [ "$(basename $1)" == "CHECKSUMS.md5" ];then
|
||||
X86_64=$(ls /var/log/packages/aaa_base*x86_64*|head -1 2>/dev/null)
|
||||
for PREPO in $REPOPLUS;do
|
||||
if [ ! -z "$X86_64" ];then
|
||||
egrep -e ^[a-f0-9]{32} ${TMPDIR}/CHECKSUMS.md5-$PREPO|egrep -- "-(x86_64|noarch)-" |sed -r "s# \./# ./SLACKPKGPLUS_$PREPO/#" >> ${TMPDIR}/CHECKSUMS.md5
|
||||
else
|
||||
egrep -e ^[a-f0-9]{32} ${TMPDIR}/CHECKSUMS.md5-$PREPO|egrep -v -- "-(x86_64|arm)-" |sed -r "s# \./# ./SLACKPKGPLUS_$PREPO/#" >> ${TMPDIR}/CHECKSUMS.md5
|
||||
fi
|
||||
if [ ! -z "$X86_64" ];then
|
||||
egrep -e ^[a-f0-9]{32} ${TMPDIR}/CHECKSUMS.md5-$PREPO|egrep -- "-(x86_64|noarch)-" |sed -r "s# \./# ./SLACKPKGPLUS_$PREPO/#" >> ${TMPDIR}/CHECKSUMS.md5
|
||||
else
|
||||
egrep -e ^[a-f0-9]{32} ${TMPDIR}/CHECKSUMS.md5-$PREPO|egrep -v -- "-(x86_64|arm)-" |sed -r "s# \./# ./SLACKPKGPLUS_$PREPO/#" >> ${TMPDIR}/CHECKSUMS.md5
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
# override slackpkg checkmd5()
|
||||
# Verify if the package was corrupted by checking md5sum
|
||||
function checkmd5() {
|
||||
local MD5ORIGINAL
|
||||
local MD5DOWNLOAD
|
||||
local PREPO
|
||||
# override slackpkg checkmd5()
|
||||
# Verify if the package was corrupted by checking md5sum
|
||||
function checkmd5() {
|
||||
local MD5ORIGINAL
|
||||
local MD5DOWNLOAD
|
||||
local PREPO
|
||||
|
||||
PREPO=$(echo $1 | rev | cut -f3 -d/ | rev)
|
||||
PREPO=$(echo $1 | rev | cut -f3 -d/ | rev)
|
||||
|
||||
MD5ORIGINAL=$( grep -v "/source/" ${CHECKSUMSFILE} |\
|
||||
grep -w $PREPO |\
|
||||
grep -m1 "/$(basename $1)$" | cut -f1 -d \ )
|
||||
MD5DOWNLOAD=$(md5sum ${1} | cut -f1 -d \ )
|
||||
if [ "$MD5ORIGINAL" = "$MD5DOWNLOAD" ]; then
|
||||
echo 1
|
||||
else
|
||||
echo 0
|
||||
fi
|
||||
}
|
||||
MD5ORIGINAL=$(grep -v "/source/" ${CHECKSUMSFILE} | grep -w $PREPO | grep -m1 "/$(basename $1)$" | cut -f1 -d \ )
|
||||
MD5DOWNLOAD=$(md5sum ${1} | cut -f1 -d \ )
|
||||
if [ "$MD5ORIGINAL" = "$MD5DOWNLOAD" ]; then
|
||||
echo 1
|
||||
else
|
||||
echo 0
|
||||
fi
|
||||
}
|
||||
|
||||
# Found packages in repository.
|
||||
# Found packages in repository.
|
||||
# This function selects the package from the higher priority
|
||||
# repository directories.
|
||||
#
|
||||
# This Modified version supports enhanced priority rule (priority
|
||||
# given to package(s) from a given repository). This kind of priority
|
||||
# This Modified version supports enhanced priority rule (priority
|
||||
# given to package(s) from a given repository). This kind of priority
|
||||
# uses the following syntax :
|
||||
#
|
||||
# repository_name:pattern
|
||||
#
|
||||
#
|
||||
function givepriority {
|
||||
local DIR
|
||||
local ARGUMENT=$1
|
||||
|
|
@ -174,45 +172,45 @@ function checkmd5() {
|
|||
unset NAME
|
||||
unset FULLNAME
|
||||
unset PKGDATA
|
||||
|
||||
|
||||
for CPRIORITY in ${PRIORITY[@]} ; do
|
||||
[ "$PKGDATA" ] && break
|
||||
|
||||
|
||||
if echo "$CPRIORITY " | grep -q "[a-zA-Z0-9]\+[:]" ; then
|
||||
DIR=$(echo "$CPRIORITY" | cut -f1 -d":")
|
||||
PAT=$(echo "$CPRIORITY" | cut -f2- -d":")
|
||||
|
||||
# ARGUMENT is always a basename. But PAT can be:
|
||||
# 1. a regular expression (ie .*)
|
||||
# 2. a basename (openjdk)
|
||||
# 3. a partial (or complete) package name (vlc-2.0.6, ).
|
||||
#
|
||||
# The current "enhanced priority rule" is applied :
|
||||
# + In case (1) and (2) when ARGUMENT contains the pattern PAT
|
||||
# + In the case (3) when ARGUMENT starts the pattern PAT.
|
||||
#
|
||||
if echo "$ARGUMENT" | grep -q "$PAT" || echo "$PAT" | grep "^$ARGUMENT" ; then
|
||||
PKGDATA=""
|
||||
PKGINFOS=$(grep -n -m 1 "^${DIR} ${ARGUMENT} " ${TMPDIR}/pkglist)
|
||||
|
||||
if [ ! -z "$PKGINFOS" ] ; then
|
||||
LINEIDX=$(echo "$PKGINFOS" | cut -f1 -d":")
|
||||
PKGDATA=( $(echo "$PKGINFOS" | cut -f2- -d":") )
|
||||
|
||||
# -- move the line at #LINEIDX to #PRIORITYIDX and
|
||||
# increment PRIORITYIDX
|
||||
#
|
||||
sed -i --expression "${LINEIDX}d" --expression "${PRIORITYIDX}i${PKGDATA[*]}" ${TMPDIR}/pkglist
|
||||
(( PRIORITYIDX++ ))
|
||||
fi
|
||||
fi
|
||||
else
|
||||
PKGDATA=( $(grep "^${CPRIORITY} ${ARGUMENT} " ${TMPDIR}/pkglist) )
|
||||
DIR=$(echo "$CPRIORITY" | cut -f1 -d":")
|
||||
PAT=$(echo "$CPRIORITY" | cut -f2- -d":")
|
||||
|
||||
# ARGUMENT is always a basename. But PAT can be:
|
||||
# 1. a regular expression (ie .*)
|
||||
# 2. a basename (openjdk)
|
||||
# 3. a partial (or complete) package name (vlc-2.0.6, ).
|
||||
#
|
||||
# The current "enhanced priority rule" is applied :
|
||||
# + In case (1) and (2) when ARGUMENT contains the pattern PAT
|
||||
# + In the case (3) when ARGUMENT starts the pattern PAT.
|
||||
#
|
||||
if echo "$ARGUMENT" | grep -q "$PAT" || echo "$PAT" | grep "^$ARGUMENT" ; then
|
||||
PKGDATA=""
|
||||
PKGINFOS=$(grep -n -m 1 "^${DIR} ${ARGUMENT} " ${TMPDIR}/pkglist)
|
||||
|
||||
if [ ! -z "$PKGINFOS" ] ; then
|
||||
LINEIDX=$(echo "$PKGINFOS" | cut -f1 -d":")
|
||||
PKGDATA=( $(echo "$PKGINFOS" | cut -f2- -d":") )
|
||||
|
||||
# -- move the line at #LINEIDX to #PRIORITYIDX and
|
||||
# increment PRIORITYIDX
|
||||
#
|
||||
sed -i --expression "${LINEIDX}d" --expression "${PRIORITYIDX}i${PKGDATA[*]}" ${TMPDIR}/pkglist
|
||||
(( PRIORITYIDX++ ))
|
||||
fi
|
||||
fi
|
||||
else
|
||||
PKGDATA=( $(grep "^${CPRIORITY} ${ARGUMENT} " ${TMPDIR}/pkglist) )
|
||||
fi
|
||||
|
||||
|
||||
if [ "$PKGDATA" ]; then
|
||||
NAME=${PKGDATA[1]}
|
||||
FULLNAME=$(echo "${PKGDATA[5]}.${PKGDATA[7]}")
|
||||
NAME=${PKGDATA[1]}
|
||||
FULLNAME=$(echo "${PKGDATA[5]}.${PKGDATA[7]}")
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
|
@ -224,14 +222,14 @@ function checkmd5() {
|
|||
|
||||
grep -vE "(^#|^[[:blank:]]*$)" ${CONF}/blacklist > ${TMPDIR}/blacklist
|
||||
if echo $CMD | grep -q install ; then
|
||||
ls -1 /var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
|
||||
ls -1 /var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
|
||||
else
|
||||
ls -1 /var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk | applyblacklist > ${TMPDIR}/tmplist
|
||||
ls -1 /var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk | applyblacklist > ${TMPDIR}/tmplist
|
||||
fi
|
||||
cat ${WORKDIR}/pkglist | applyblacklist > ${TMPDIR}/pkglist
|
||||
|
||||
touch ${TMPDIR}/waiting
|
||||
|
||||
|
||||
# -- PKGLIST:
|
||||
# temporary file used to store data about packages. It use
|
||||
# the following format:
|
||||
|
|
@ -239,61 +237,61 @@ function checkmd5() {
|
|||
#
|
||||
PKGLIST=$(tempfile --directory=$TMPDIR)
|
||||
PKGINFOS=$(tempfile --directory=$TMPDIR)
|
||||
|
||||
|
||||
for i in ${PRIORITY[@]}; do
|
||||
DIR="$i"
|
||||
if echo "$DIR" | grep -q "[a-zA-Z0-9]\+[:]" ; then
|
||||
DIR=$(echo "$i" | cut -f2- -d":")
|
||||
DIR=$(echo "$i" | cut -f2- -d":")
|
||||
fi
|
||||
|
||||
if [ "$CMD" == "file-search" ] ; then
|
||||
[ ! -e "${WORKDIR}/${DIR}-filelist.gz" ] && continue
|
||||
[ ! -e "${WORKDIR}/${DIR}-filelist.gz" ] && continue
|
||||
|
||||
# NOTE:
|
||||
# The awk below produces an output formatted like
|
||||
# in file TMPDIR/pkglist, but without true values
|
||||
# for the fields: version(3) arch(4) build(5), path(7),
|
||||
# extension(8)
|
||||
#
|
||||
zegrep -w "${INPUTLIST}" ${WORKDIR}/${DIR}-filelist.gz | \
|
||||
cut -d" " -f 1 | rev | cut -f2- -d"." | cut -f1 -d"/" | rev |\
|
||||
awk '{
|
||||
l_pname=$0
|
||||
l_count=split($0,l_parts,"-");
|
||||
l_basename=l_parts[1];
|
||||
for (i=2;i<=l_count-3;i++) {
|
||||
l_basename=l_basename"-"l_parts[i];
|
||||
}
|
||||
print l_dir" "l_basename" ------- ---- ----- "l_pname" ---- ---------"
|
||||
}' l_dir=${DIR} > $PKGINFOS
|
||||
# NOTE:
|
||||
# The awk below produces an output formatted like
|
||||
# in file TMPDIR/pkglist, but without true values
|
||||
# for the fields: version(3) arch(4) build(5), path(7),
|
||||
# extension(8)
|
||||
#
|
||||
zegrep -w "${INPUTLIST}" ${WORKDIR}/${DIR}-filelist.gz | \
|
||||
cut -d" " -f 1 | rev | cut -f2- -d"." | cut -f1 -d"/" | rev |\
|
||||
awk '{
|
||||
l_pname=$0
|
||||
l_count=split($0,l_parts,"-");
|
||||
l_basename=l_parts[1];
|
||||
for (i=2;i<=l_count-3;i++) {
|
||||
l_basename=l_basename"-"l_parts[i];
|
||||
}
|
||||
print l_dir" "l_basename" ------- ---- ----- "l_pname" ---- ---------"
|
||||
}' l_dir=${DIR} > $PKGINFOS
|
||||
|
||||
else # -- CMD==search
|
||||
grep "^${DIR}.*${PATTERN}" "${TMPDIR}/pkglist" > $PKGINFOS
|
||||
grep "^${DIR}.*${PATTERN}" "${TMPDIR}/pkglist" > $PKGINFOS
|
||||
fi
|
||||
|
||||
|
||||
while read PKG ; do
|
||||
PKGDIR=$(echo "$PKG" | cut -f1 -d" ")
|
||||
PKGBASENAME=$(echo "$PKG" | cut -f2 -d" ")
|
||||
PKGFULLNAME=$(echo "$PKG" | cut -f6 -d" ")
|
||||
|
||||
if echo "$PKGDIR" | grep -q "SLACKPKGPLUS_" ; then
|
||||
grep -q "^repository:${PKGDIR}:basename:${PKGBASENAME}:" $PKGLIST && continue
|
||||
else
|
||||
grep -q ":basename:${PKGBASENAME}:" $PKGLIST && continue
|
||||
fi
|
||||
LIST="$LIST ${PKGDIR}:${PKGFULLNAME}"
|
||||
echo "repository:${PKGDIR}:basename:${PKGBASENAME}:" >> $PKGLIST
|
||||
PKGDIR=$(echo "$PKG" | cut -f1 -d" ")
|
||||
PKGBASENAME=$(echo "$PKG" | cut -f2 -d" ")
|
||||
PKGFULLNAME=$(echo "$PKG" | cut -f6 -d" ")
|
||||
|
||||
if echo "$PKGDIR" | grep -q "SLACKPKGPLUS_" ; then
|
||||
grep -q "^repository:${PKGDIR}:basename:${PKGBASENAME}:" $PKGLIST && continue
|
||||
else
|
||||
grep -q ":basename:${PKGBASENAME}:" $PKGLIST && continue
|
||||
fi
|
||||
LIST="$LIST ${PKGDIR}:${PKGFULLNAME}"
|
||||
echo "repository:${PKGDIR}:basename:${PKGBASENAME}:" >> $PKGLIST
|
||||
done < $PKGINFOS
|
||||
done
|
||||
rm -f $PKGLIST $PKGINFOS
|
||||
rm -f $PKGLIST $PKGINFOS
|
||||
|
||||
LIST=$(echo -e $LIST | tr \ "\n" | uniq )
|
||||
|
||||
rm ${TMPDIR}/waiting
|
||||
|
||||
echo -e "DONE\n"
|
||||
echo -e "DONE\n"
|
||||
}
|
||||
|
||||
|
||||
function searchlistEX() {
|
||||
local i
|
||||
local BASENAME
|
||||
|
|
@ -307,26 +305,26 @@ function checkmd5() {
|
|||
for i in $1; do
|
||||
REPO=$(echo "$i" | cut -f1 -d":")
|
||||
PNAME=$(echo "$i" | cut -f2- -d":")
|
||||
|
||||
|
||||
if echo "$REPO" | grep -q "SLACKPKGPLUS_" ; then
|
||||
REPO=$(echo "$REPO" | cut -f2- -d"_")
|
||||
REPO=$(echo "$REPO" | cut -f2- -d"_")
|
||||
else
|
||||
REPO=""
|
||||
fi
|
||||
|
||||
if [ -z "$REPO" ] && [ "$BASENAME" = "$(cutpkg ${PNAME})" ]; then
|
||||
continue
|
||||
REPO=""
|
||||
fi
|
||||
|
||||
# BASENAME is base package name
|
||||
if [ -z "$REPO" ] && [ "$BASENAME" = "$(cutpkg ${PNAME})" ]; then
|
||||
continue
|
||||
fi
|
||||
|
||||
# BASENAME is base package name
|
||||
BASENAME="$(cutpkg ${PNAME})"
|
||||
|
||||
# RAWNAME is Latest available version
|
||||
# RAWNAME is Latest available version
|
||||
RAWNAME="${PNAME/%.t[blxg]z/}"
|
||||
|
||||
# Default is uninstalled
|
||||
STATUS="uninstalled"
|
||||
|
||||
|
||||
# First is the package already installed?
|
||||
# Amazing what a little sleep will do
|
||||
# exclusion is so much nicer :)
|
||||
|
|
@ -336,33 +334,33 @@ function checkmd5() {
|
|||
# INSTPKG is local version
|
||||
if [ ! "${INSTPKG}" = "" ]; then
|
||||
|
||||
# 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
|
||||
# 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}"
|
||||
printf " %-16s %-24s %-40s \n" "$STATUS" "$REPO" "${RAWNAME}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
REPOPLUS=$(echo "${REPOPLUS[*]} ${PKGS_PRIORITY[*]} ${!MIRRORPLUS[*]}"|sed 's/ /\n/g'|sed 's/:.*//'|awk '{if(!a[$1]++)print $1}')
|
||||
PRIORITY=( ${PRIORITY[*]} SLACKPKGPLUS_$(echo $REPOPLUS|sed 's/ / SLACKPKGPLUS_/g') )
|
||||
|
||||
|
||||
# Test repositories
|
||||
for pp in ${REPOPLUS[*]};do
|
||||
echo "${MIRRORPLUS[$pp]}"|grep -q -e ^http:// -e ^https:// -e ^ftp:// -e ^file://
|
||||
|
|
@ -383,64 +381,64 @@ function checkmd5() {
|
|||
fi
|
||||
|
||||
# -- merge priorities from PKGS_PRIORITY with PRIORITY, as needed ...
|
||||
|
||||
|
||||
if [ ! -z "$PKGS_PRIORITY" -a "$CMD" != "update" ] ; then
|
||||
PREFIX=""
|
||||
|
||||
|
||||
for pp in ${PKGS_PRIORITY[*]} ; do
|
||||
repository=$(echo "$pp" | cut -f1 -d":")
|
||||
package=$(echo "$pp" | cut -f2- -d":")
|
||||
|
||||
|
||||
if [ ! -z "$repository" ] && [ ! -z "$package" ] ; then
|
||||
if [ -z "$PREFIX" ] ; then
|
||||
PREFIX=( SLACKPKGPLUS_${repository}:$package )
|
||||
else
|
||||
PREFIX=( ${PREFIX[*]} SLACKPKGPLUS_${repository}:$package )
|
||||
fi
|
||||
if [ -z "$PREFIX" ] ; then
|
||||
PREFIX=( SLACKPKGPLUS_${repository}:$package )
|
||||
else
|
||||
PREFIX=( ${PREFIX[*]} SLACKPKGPLUS_${repository}:$package )
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
[ ! -z "$PREFIX" ] && PRIORITY=( ${PREFIX[*]} ${PRIORITY[*]} )
|
||||
fi
|
||||
|
||||
# -- This flag is set when running slackpkg to manage the multilib :
|
||||
#
|
||||
# slackpkg install|upgrade|reinstall|remove <multilib_repository_name>
|
||||
#
|
||||
# This is used by applyblacklist() to prevent silent exclusion of
|
||||
# multilib package aaa_elflibs-compat32 when /etc/slackpkg/blacklist
|
||||
# contains the pattern aaa_elflibs.
|
||||
#
|
||||
|
||||
# -- This flag is set when running slackpkg to manage the multilib :
|
||||
#
|
||||
# slackpkg install|upgrade|reinstall|remove <multilib_repository_name>
|
||||
#
|
||||
# This is used by applyblacklist() to prevent silent exclusion of
|
||||
# multilib package aaa_elflibs-compat32 when /etc/slackpkg/blacklist
|
||||
# contains the pattern aaa_elflibs.
|
||||
#
|
||||
MLREPO_SELELECTED=false
|
||||
|
||||
# -- Ensures the internal blacklist is empty
|
||||
#
|
||||
|
||||
# -- 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.
|
||||
#
|
||||
|
||||
# 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
|
||||
echo "$1" >> ${TMPDIR}/blacklist.slackpkgplus
|
||||
}
|
||||
|
||||
# Override original applyblackist() so that internal blacklist will
|
||||
# be applied too.
|
||||
#
|
||||
function applyblacklist() {
|
||||
# -- This is to prevent silent exclusion of multilib package
|
||||
# aaa_elflibs-compat32 when /etc/slackpkg/blacklist contains the
|
||||
# pattern aaa_elflibs.
|
||||
if $MLREPO_SELELECTED && grep -q "^aaa_elflibs$" ${TMPDIR}/blacklist && ! grep -q "^aaa_elflibs-compat32$" ${TMPDIR}/blacklist ; then
|
||||
sed -i --expression "s/^aaa_elflibs/#aaa_elflibs/" ${TMPDIR}/blacklist
|
||||
grep -vEw -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus | grep -v "[ ]aaa_elflibs[ ]"
|
||||
else
|
||||
grep -vEw -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus
|
||||
fi
|
||||
|
||||
# Override original applyblackist() so that internal blacklist will
|
||||
# be applied too.
|
||||
#
|
||||
function applyblacklist() {
|
||||
# -- This is to prevent silent exclusion of multilib package
|
||||
# aaa_elflibs-compat32 when /etc/slackpkg/blacklist contains the
|
||||
# pattern aaa_elflibs.
|
||||
if $MLREPO_SELELECTED && grep -q "^aaa_elflibs$" ${TMPDIR}/blacklist && ! grep -q "^aaa_elflibs-compat32$" ${TMPDIR}/blacklist ; then
|
||||
sed -i --expression "s/^aaa_elflibs/#aaa_elflibs/" ${TMPDIR}/blacklist
|
||||
grep -vEw -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus | grep -v "[ ]aaa_elflibs[ ]"
|
||||
else
|
||||
grep -vEw -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
|
||||
if [ -z "$DOWNLOADER" ];then
|
||||
DOWNLOADER="wget --passive-ftp -O"
|
||||
|
|
@ -453,8 +451,8 @@ function checkmd5() {
|
|||
DOWNLOADER="wget -nv --passive-ftp -O"
|
||||
fi
|
||||
|
||||
# Global variable required by givepriority()
|
||||
#
|
||||
# Global variable required by givepriority()
|
||||
#
|
||||
PRIORITYIDX=1
|
||||
|
||||
|
||||
|
|
@ -465,100 +463,100 @@ function checkmd5() {
|
|||
|
||||
for pref in $INPUTLIST ; do
|
||||
if echo "$pref" | grep -q "[a-zA-Z0-9]\+[:][a-zA-Z0-9]\+" ; then
|
||||
|
||||
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
|
||||
|
||||
echo "$pref" | grep -qi "multilib" && MLREPO_SELELECTED=true
|
||||
|
||||
if $MLREPO_SELELECTED && [ "$CMD" == "remove" ] ; then
|
||||
internal_blacklist "glibc"
|
||||
internal_blacklist "gcc"
|
||||
fi
|
||||
|
||||
package="SLACKPKGPLUS_${pref}"
|
||||
PRIORITYLIST=( ${PRIORITYLIST[*]} SLACKPKGPLUS_${pref}:.* )
|
||||
elif grep -q "^${pref}[ ]" ${WORKDIR}/pkglist ; then
|
||||
|
||||
# -- ${pref} relates to one of the standard directories (ie
|
||||
# slackware,slackware64,testing,extra,...). In this case,
|
||||
# packages is set to "^${pref}" to avoid packages outside
|
||||
# the given "directories" to be selected. For instance,
|
||||
# without this, if slackpkg+ is configured with the
|
||||
# repositories "multilib" and "microlinux", running
|
||||
# "slackpkg install slackware64" leads to install packages
|
||||
# from slackware64 directory, but also packages from
|
||||
# "multilib" and "microlinux" repositories, because packages
|
||||
# from these repositories are stored in directories whose
|
||||
# names include the word "slackware64".
|
||||
#
|
||||
package="^${pref}"
|
||||
else
|
||||
package=$pref
|
||||
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
|
||||
|
||||
echo "$pref" | grep -qi "multilib" && MLREPO_SELELECTED=true
|
||||
|
||||
if $MLREPO_SELELECTED && [ "$CMD" == "remove" ] ; then
|
||||
internal_blacklist "glibc"
|
||||
internal_blacklist "gcc"
|
||||
fi
|
||||
|
||||
package="SLACKPKGPLUS_${pref}"
|
||||
PRIORITYLIST=( ${PRIORITYLIST[*]} SLACKPKGPLUS_${pref}:.* )
|
||||
elif grep -q "^${pref}[ ]" ${WORKDIR}/pkglist ; then
|
||||
|
||||
# -- ${pref} relates to one of the standard directories (ie
|
||||
# slackware,slackware64,testing,extra,...). In this case,
|
||||
# packages is set to "^${pref}" to avoid packages outside
|
||||
# the given "directories" to be selected. For instance,
|
||||
# without this, if slackpkg+ is configured with the
|
||||
# repositories "multilib" and "microlinux", running
|
||||
# "slackpkg install slackware64" leads to install packages
|
||||
# from slackware64 directory, but also packages from
|
||||
# "multilib" and "microlinux" repositories, because packages
|
||||
# from these repositories are stored in directories whose
|
||||
# names include the word "slackware64".
|
||||
#
|
||||
package="^${pref}"
|
||||
else
|
||||
package=$pref
|
||||
fi
|
||||
|
||||
# -- only insert "package" if not in NEWINPUTLIST
|
||||
echo "$NEWINPUTLIST" | grep -qw "${package}" || 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
|
||||
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" == "search" ] || [ "$CMD" == "file-search" ] ; then
|
||||
PATTERN=$(echo $ARG | sed -e 's/\+/\\\+/g' -e 's/\./\\\./g' -e 's/ /\|/g')
|
||||
searchPackages $PATTERN
|
||||
|
||||
|
||||
case $CMD in
|
||||
search)
|
||||
if [ "$LIST" = "" ]; then
|
||||
echo -e "No package name matches the pattern."
|
||||
else
|
||||
echo -e "The list below shows all packages with name matching \"$PATTERN\".\n"
|
||||
searchlistEX "$LIST"
|
||||
echo -e "\nYou can search specific files using \"slackpkg file-search file\".\n"
|
||||
fi
|
||||
search)
|
||||
if [ "$LIST" = "" ]; then
|
||||
echo -e "No package name matches the pattern."
|
||||
else
|
||||
echo -e "The list below shows all packages with name matching \"$PATTERN\".\n"
|
||||
searchlistEX "$LIST"
|
||||
echo -e "\nYou can search specific files using \"slackpkg file-search file\".\n"
|
||||
fi
|
||||
;;
|
||||
|
||||
|
||||
file-search)
|
||||
if [ "$LIST" = "" ]; then
|
||||
echo -e "No packages contains \"$PATTERN\" file."
|
||||
else
|
||||
echo -e "The list below shows the packages that contains \"$PATTERN\" file.\n"
|
||||
searchlistEX "$LIST"
|
||||
echo -e "\nYou can search specific packages using \"slackpkg search package\".\n"
|
||||
fi
|
||||
if [ "$LIST" = "" ]; then
|
||||
echo -e "No packages contains \"$PATTERN\" file."
|
||||
else
|
||||
echo -e "The list below shows the packages that contains \"$PATTERN\" file.\n"
|
||||
searchlistEX "$LIST"
|
||||
echo -e "\nYou can search specific packages using \"slackpkg search package\".\n"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
cleanup
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue