mirror of
https://github.com/zuno/slackpkgplus
synced 2025-01-13 20:01:04 +01:00
Version 1.7.a3 - 10/Jan/2015
- 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
removed TABs from all files
This commit is contained in:
Matteo Rossini
parent
aca5d2ab80
commit
fac0996698
8 changed files with 188 additions and 177 deletions
|
|
@ -1,3 +1,8 @@
|
|||
Version 1.7.a3 - 10/Jan/2015
|
||||
- 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
|
||||
- Remember user to (re)run 'slackpkg update gpg'
|
||||
- Fixed Download Only when upgrade base packages (aaa_base, pkgtools...)
|
||||
|
|
@ -9,7 +14,7 @@ Version 1.7.a1 - 04/Jan/2015
|
|||
test possible to make it bugfree ;).
|
||||
- Code reordering; now slackpkg+ is only slackpkgplus.sh
|
||||
- Added repositories; improved checkrepos.sh
|
||||
- BugFix: slackpk give 'grep: write error' when running with "sudo su -"
|
||||
- BugFix: slackpkg give 'grep: write error' when running with "sudo su -"
|
||||
- SecurityFix: Strict GPG Check. Packages MUST to be signed with root-GPG-KEY.
|
||||
If can disable it via CHECKGPG in slackpkgplus.sh; see README
|
||||
- New repository for slackpkg+ development version
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
Version 1.7.a3 - 10/Jan/2015
|
||||
- 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
|
||||
- Remember user to (re)run 'slackpkg update gpg'
|
||||
- Fixed Download Only when upgrade base packages (aaa_base, pkgtools...)
|
||||
|
|
@ -9,7 +14,7 @@ Version 1.7.a1 - 04/Jan/2015
|
|||
test possible to make it bugfree ;).
|
||||
- Code reordering; now slackpkg+ is only slackpkgplus.sh
|
||||
- Added repositories; improved checkrepos.sh
|
||||
- BugFix: slackpk give 'grep: write error' when running with "sudo su -"
|
||||
- BugFix: slackpkg give 'grep: write error' when running with "sudo su -"
|
||||
- SecurityFix: Strict GPG Check. Packages MUST to be signed with root-GPG-KEY.
|
||||
If can disable it via CHECKGPG in slackpkgplus.sh; see README
|
||||
- New repository for slackpkg+ development version
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ for R in $REPOS;do
|
|||
[ $V ]&&echo
|
||||
REPO=${R%/}
|
||||
echo -n "Repository: $REPO/ "
|
||||
|
||||
HOST=$(echo $REPO|cut -f3 -d/)
|
||||
[ $V ]&&echo -en "\n Host: $HOST\n Check IP: "||echo -n .
|
||||
if echo $HOST|egrep -q '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$';then
|
||||
|
|
@ -89,6 +90,7 @@ for R in $REPOS;do
|
|||
[ $V ]&&echo -e " unable to resolve\nInvalid repository"|grep --color .||echo " Invalid (unable to resolve address)"|grep --color .
|
||||
continue
|
||||
fi
|
||||
|
||||
[ $V ]&&echo -en " $IP\n Check connection: "||echo -n .
|
||||
echo |timeout 10 telnet $IP 80 > telnet.out 2>&1
|
||||
ERR=$?
|
||||
|
|
@ -105,7 +107,6 @@ for R in $REPOS;do
|
|||
continue
|
||||
fi
|
||||
|
||||
|
||||
MD5=no
|
||||
[ $V ]&&echo -en " CHECKSUMS.md5: "||echo -n .
|
||||
curl --location --head $REPO/CHECKSUMS.md5 > CHECKSUMS.md5.R 2>/dev/null
|
||||
|
|
|
|||
|
|
@ -656,23 +656,23 @@ if [ "$SLACKPKGPLUS" = "on" ];then
|
|||
echo 1
|
||||
fi
|
||||
if [ "$(basename $1)" == "CHECKSUMS.md5" ];then
|
||||
if [ "$TAG_PRIORITY" == "on" ];then
|
||||
# if [ "$TAG_PRIORITY" == "on" ];then
|
||||
mv ${TMPDIR}/CHECKSUMS.md5 ${TMPDIR}/CHECKSUMS.md5-old
|
||||
for PREPO in ${PRIORITY[*]};do
|
||||
grep " \./$PREPO/" ${TMPDIR}/CHECKSUMS.md5-old >> ${TMPDIR}/CHECKSUMS.md5
|
||||
done
|
||||
fi
|
||||
# fi
|
||||
X86_64=$(ls $ROOT/var/log/packages/aaa_base*x86_64* 2>/dev/null|head -1)
|
||||
for PREPO in ${REPOPLUS[*]};do
|
||||
if [ ! -z "$X86_64" ];then
|
||||
if [ "$ALLOW32BIT" == "on" ];then
|
||||
egrep -e ^[a-f0-9]{32} ${TMPDIR}/CHECKSUMS.md5-$PREPO|egrep -v -- "-(arm)-" |sed -r "s# \./# ./SLACKPKGPLUS_$PREPO/#" >> ${TMPDIR}/CHECKSUMS.md5
|
||||
if [ -z "$X86_64" ];then
|
||||
FILTEREXCLUDE="-(x86_64|arm)-"
|
||||
elif [ "$ALLOW32BIT" == "on" ];then
|
||||
FILTEREXCLUDE="-(arm)-"
|
||||
else
|
||||
egrep -e ^[a-f0-9]{32} ${TMPDIR}/CHECKSUMS.md5-$PREPO|egrep -v -- "-(i[3456]86|arm)-" |sed -r "s# \./# ./SLACKPKGPLUS_$PREPO/#" >> ${TMPDIR}/CHECKSUMS.md5
|
||||
fi
|
||||
else
|
||||
egrep -e ^[a-f0-9]{32} ${TMPDIR}/CHECKSUMS.md5-$PREPO|egrep -v -- "-(x86_64|arm)-" |sed -r "s# \./# ./SLACKPKGPLUS_$PREPO/#" >> ${TMPDIR}/CHECKSUMS.md5
|
||||
FILTEREXCLUDE="-(x86|i[3456]86|arm)-"
|
||||
fi
|
||||
egrep -e ^[a-f0-9]{32} ${TMPDIR}/CHECKSUMS.md5-$PREPO|egrep -v -- "$FILTEREXCLUDE" |sed -r -e "s# \./# ./SLACKPKGPLUS_$PREPO/#" >> ${TMPDIR}/CHECKSUMS.md5
|
||||
#egrep -e ^[a-f0-9]{32} ${TMPDIR}/CHECKSUMS.md5-$PREPO|egrep -v -- "$FILTEREXCLUDE" |sed -r -e "s# \./# ./SLACKPKGPLUS_$PREPO/#" -e 's#^(.*)/([^/]+)$#\2 \1/\2#'|sort -rn|cut -f2- -d" " >> ${TMPDIR}/CHECKSUMS.md5
|
||||
done
|
||||
fi
|
||||
} # END function checkgpg()
|
||||
|
|
@ -1171,7 +1171,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
|
|||
|
||||
|
||||
|
||||
SPKGPLUS_VERSION="1.7.a2"
|
||||
SPKGPLUS_VERSION="1.7.a3"
|
||||
VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -80,8 +80,8 @@ REPOPLUS=( slackpkgplus )
|
|||
|
||||
|
||||
# Define mirrors (uncomment one or more mirror; remember to add it to REPOPLUS)
|
||||
# GPG Note: after adding a repository, you must to run 'slackpkg update gpg'
|
||||
# some repositories as salixos or slackel, have a partial GPG support;
|
||||
# GPG Note: after adding/renaming a repository, you must to run 'slackpkg update gpg'
|
||||
# some repositories as salixos, have a partial GPG support;
|
||||
# for that repositories you may need to run slackpkg with 'slackpkg -checkgpg=off ...'
|
||||
|
||||
# Slackware 14.1 - i386
|
||||
|
|
|
|||
|
|
@ -96,8 +96,8 @@ REPOPLUS=( slackpkgplus )
|
|||
|
||||
|
||||
# Define mirrors (uncomment one or more mirror; remember to add it to REPOPLUS)
|
||||
# GPG Note: after adding a repository, you must to run 'slackpkg update gpg'
|
||||
# some repositories as salixos or slackel, have a partial GPG support;
|
||||
# GPG Note: after adding/renaming a repository, you must to run 'slackpkg update gpg'
|
||||
# some repositories as salixos, have a partial GPG support;
|
||||
# for that repositories you may need to run slackpkg with 'slackpkg -checkgpg=off ...'
|
||||
|
||||
# Slackware 14.1 - x86_64
|
||||
|
|
|
|||
Loading…
Reference in a new issue