Miroirs/slackpkgplus
1
0
Fork 0
mirror of https://github.com/zuno/slackpkgplus synced 2025-01-13 20:01:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Version 0.9rc3 - 01/May/2013

Browse source 
- added more config file checks
  - fixed a bug that does not allow to use the gpg check
  - fixed a bug that deny to use local slackware mirror
This commit is contained in:
Matteo Rossini 2013-05-01 23:31:00 +02:00
parent afddae5749
commit ca37955286
7 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog.txt
View file

@ -1,3 +1,8 @@
Version 0.9rc3 - 01/May/2013
- added more config file checks
- fixed a bug that does not allow to use the gpg check
- fixed a bug that deny to use local slackware mirror
Version 0.9rc2 - 30/Apr/2013
- added config file checks
- fixed a bug that try to check gpg even if CHECKGPG is set to off

2
src/doinst.sh
View file

@ -30,7 +30,7 @@ copy_config_file() {
SRCMIRROR=slackpkgplus.x86.sample
;;
esac
cp usr/doc/slackpkg+-0.9rc2/$SRCMIRROR etc/slackpkg/slackpkgplus.conf.new
cp usr/doc/slackpkg+-0.9rc3/$SRCMIRROR etc/slackpkg/slackpkgplus.conf.new
}
copy_config_file

2
src/repositories.txt
View file

@ -37,10 +37,8 @@ slacky | X | | | X | | X | http://repository.s
slacky | X | | | | X | X | http://repository.slacky.eu/slackware64-13.37/
slacky | | X | | X | | X | http://repository.slacky.eu/slackware-14.0/
slacky | | X | | | X | X | http://repository.slacky.eu/slackware64-14.0/
ponce | X | | | X | | X | http://ponce.cc/slackware/slackware-13.37/packages/
ponce | X | | | | X | X | http://ponce.cc/slackware/slackware-14.0/packages/
ponce | | X | | X | | X | http://ponce.cc/slackware/slackware-current/packages/
ponce | | X | | | X | X | http://ponce.cc/slackware/slackware64-13.37/packages/
ponce | | | X | X | | X | http://ponce.cc/slackware/slackware64-14.0/packages/
ponce | | | X | | X | X | http://ponce.cc/slackware/slackware64-current/packages/
salixos | X | | | X | | | http://download.salixos.org/i486/13.37/

5
src/slackpkg+.SlackBuild
View file

@ -1,6 +1,8 @@
#!/bin/bash
VERSION=0.9rc2
set -e
VERSION=0.9rc3
BUILD=1mt
CWD=`pwd`
@ -16,7 +18,6 @@ mkdir -p usr/doc/slackpkg+-$VERSION/
mkdir -p install/
cp $CWD/slackpkgplus.sh usr/libexec/slackpkg/functions.d/
cp $CWD/slackpkgplus.conf etc/slackpkg/slackpkgplus.conf.new
cp $CWD/README usr/doc/slackpkg+-$VERSION/
cp $CWD/repositories.txt usr/doc/slackpkg+-$VERSION/
cp $CWD/slackpkg+.SlackBuild usr/doc/slackpkg+-$VERSION/

28
src/slackpkgplus.sh
View file

@ -11,6 +11,25 @@ if [ "$SLACKPKGPLUS" = "on" ];then
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://
if [ $? -ne 0 ];then
echo "Repository '$pp' not configured." >> $TMPDIR/error.log
echo "Add:" >> $TMPDIR/error.log
echo "MIRRORPLUS['$pp']=http://repoaddres/..." >> $TMPDIR/error.log
echo "See documentation in /usr/doc/slackpkg+-* for details" >> $TMPDIR/error.log
cleanup
fi
done
if [ /etc/slackpkgplus.conf -nt /var/lib/slackpkg/pkglist -a "$CMD" != "update" ];then
echo
echo "NOTICE: remember to re-run 'slackpkg update' after modifing slackpkgplus.conf"
echo
sleep 5
fi
# -- merge priorities from PKGS_PRIORITY with PRIORITY, as needed ...
@ -47,10 +66,17 @@ if [ "$SLACKPKGPLUS" = "on" ];then
done
fi
}
if [ -z "$DOWNLOADER" ];then
DOWNLOADER="wget --passive-ftp -O"
fi
function getfile(){
local URLFILE
URLFILE=$1
if [ ${URLFILE:0:1} = "/" ];then
URLFILE="file:/$URLFILE"
fi
if echo $URLFILE|grep -q /slackpkgplus_;then
PREPO=$(echo $URLFILE|sed -r 's#^.*/slackpkgplus_([^/]+)/.*$#\1#')
URLFILE=$(echo $URLFILE|sed "s#^.*/slackpkgplus_$PREPO/#${MIRRORPLUS[$PREPO]}#")
@ -82,7 +108,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
fi
if [ $(basename $1) = "CHECKSUMS.md5.asc" ];then
if [ "CHECKGPG" = "on" ];then
if [ "$CHECKGPG" = "on" ];then
for PREPO in $REPOPLUS;do
URLFILE=${MIRRORPLUS[${PREPO/slackpkgplus_}]}CHECKSUMS.md5.asc
if echo $URLFILE | grep -q "^file://" ; then

2
src/slackpkgplus.x86.sample
View file

@ -39,7 +39,7 @@ MIRRORPLUS['ponce']=http://ponce.cc/slackware/slackware-14.0/packages/
# alienbob: http://taper.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0}/{x86,x86_64}/
# 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}/
# ponce: http://ponce.cc/slackware/slackware{,64}-{13.37,14.0,current}/packages/
# ponce: http://ponce.cc/slackware/slackware{,64}-{14.0,current}/packages/
#
# Does NOT supports GPG
# salixos: http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/

2
src/slackpkgplus.x86_64.sample
View file

@ -43,7 +43,7 @@ MIRRORPLUS['ponce']=http://ponce.cc/slackware/slackware64-14.0/packages/
# alienbob: http://taper.alienbase.nl/mirrors/people/alien/sbrepos/{13.37,14.0}/{x86,x86_64}/
# 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}/
# ponce: http://ponce.cc/slackware/slackware{,64}-{13.37,14.0,current}/packages/
# ponce: http://ponce.cc/slackware/slackware{,64}-{14.0,current}/packages/
#
# Does NOT supports GPG
# salixos: http://download.salixos.org/{i486,x86_64}/{13.37,14.0}/