Miroirs/slackpkgplus
1
0
Fork 0
mirror of https://github.com/zuno/slackpkgplus synced 2024-12-27 09:58:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Thu May 13 22:37:45 CEST 2021

Browse source 
pkg/slackpkg+-1.7.6-noarch-2mt.txz: Rebuilt
  - link instead copy for local repositories (thanks to zdolar)
  - WGETOPTS="-q" works with links too (use it with USETERSE=on)
  - zlookkernel did not honor PLUGIN_ZLOOKKERNEL_PROMPT=off correctly
This commit is contained in:
Matteo Rossini 2021-05-13 22:56:56 +02:00
parent 927ff4779f
commit 59917f1dc5
6 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog.txt
View file

@ -1,3 +1,10 @@
Thu May 13 22:37:45 CEST 2021
pkg/slackpkg+-1.7.6-noarch-2mt.txz: Rebuilt
- link instead copy for local repositories (thanks to zdolar)
- WGETOPTS="-q" works with links too (use it with USETERSE=on)
- zlookkernel did not honor PLUGIN_ZLOOKKERNEL_PROMPT=off correctly
+-------------------------+
Wed May 12 00:02:47 CEST 2021 Wed May 12 00:02:47 CEST 2021
pkg/slackpkg+-1.7.6-noarch-1mt.txz: Upgrade pkg/slackpkg+-1.7.6-noarch-1mt.txz: Upgrade
- Added LEGACYBL to allow slackpkg+ to use the previous blacklist system - Added LEGACYBL to allow slackpkg+ to use the previous blacklist system

7
src/ChangeLog.txt
View file

@ -1,3 +1,10 @@
Thu May 13 22:37:45 CEST 2021
pkg/slackpkg+-1.7.6-noarch-2mt.txz: Rebuilt
- link instead copy for local repositories (thanks to zdolar)
- WGETOPTS="-q" works with links too (use it with USETERSE=on)
- zlookkernel did not honor PLUGIN_ZLOOKKERNEL_PROMPT=off correctly
+-------------------------+
Wed May 12 00:02:47 CEST 2021 Wed May 12 00:02:47 CEST 2021
pkg/slackpkg+-1.7.6-noarch-1mt.txz: Upgrade pkg/slackpkg+-1.7.6-noarch-1mt.txz: Upgrade
- Added LEGACYBL to allow slackpkg+ to use the previous blacklist system - Added LEGACYBL to allow slackpkg+ to use the previous blacklist system

10
src/slackpkgplus.sh
View file

@ -561,7 +561,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
if echo $URLFILE | grep -q "^file://" ; then if echo $URLFILE | grep -q "^file://" ; then
URLFILE=${URLFILE:6} URLFILE=${URLFILE:6}
if [ -f $URLFILE ];then if [ -f $URLFILE ];then
echo -e "\tLinking $URLFILE" [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
ln -s $URLFILE $2 ln -s $URLFILE $2
else else
echo -e "\tNot found $URLFILE" echo -e "\tNot found $URLFILE"
@ -623,7 +623,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo -n "SLACKPKGPLUS_$PREPO[MD5] " >> ${TMPDIR}/CHECKSUMS.md5.asc echo -n "SLACKPKGPLUS_$PREPO[MD5] " >> ${TMPDIR}/CHECKSUMS.md5.asc
if echo $URLFILE | grep -q "^file://" ; then if echo $URLFILE | grep -q "^file://" ; then
URLFILE=${URLFILE:6} URLFILE=${URLFILE:6}
echo -e "\tLinking $URLFILE" [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
ln -s $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc ln -s $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc
md5sum ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc|awk '{print $1}' >> ${TMPDIR}/CHECKSUMS.md5.asc md5sum ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc|awk '{print $1}' >> ${TMPDIR}/CHECKSUMS.md5.asc
continue continue
@ -691,7 +691,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
if echo $URLFILE | grep -q "^file://" ; then if echo $URLFILE | grep -q "^file://" ; then
URLFILE=${URLFILE:6} URLFILE=${URLFILE:6}
echo -e "\tLinking $URLFILE" [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
ln -s $URLFILE ${TMPDIR}/$CLOGNAM ln -s $URLFILE ${TMPDIR}/$CLOGNAM
else else
if [ $VERBOSE -gt 2 ];then if [ $VERBOSE -gt 2 ];then
@ -731,7 +731,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5 URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5
if echo $URLFILE | grep -q "^file://" ; then if echo $URLFILE | grep -q "^file://" ; then
URLFILE=${URLFILE:6} URLFILE=${URLFILE:6}
echo -e "\tLinking $URLFILE" [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
ln -s $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO ln -s $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO
elif echo $URLFILE | grep -q "^dir:/" ; then elif echo $URLFILE | grep -q "^dir:/" ; then
touch ${TMPDIR}/CHECKSUMS.md5-$PREPO touch ${TMPDIR}/CHECKSUMS.md5-$PREPO
@ -817,7 +817,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY
if echo $URLFILE | grep -q "^file://" ; then if echo $URLFILE | grep -q "^file://" ; then
URLFILE=${URLFILE:6} URLFILE=${URLFILE:6}
echo -e "\tLinking $URLFILE" [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
ln -s $URLFILE $2-tmp-$PREPO ln -s $URLFILE $2-tmp-$PREPO
elif echo $URLFILE |grep -q "dir:/";then elif echo $URLFILE |grep -q "dir:/";then
continue continue

1
src/slackpkgplus.x86.sample
View file

@ -37,6 +37,7 @@ LEGACYBL=off
# Add custom option to 'wget'. # Add custom option to 'wget'.
# You can solve the repository indisponibility issue by set a timeout here # You can solve the repository indisponibility issue by set a timeout here
# Also add "-q" for super terse output (useful with USETERSE=on)
WGETOPTS="--timeout=20 --tries=2" WGETOPTS="--timeout=20 --tries=2"
# If you want replace wget with another downloader search DOWNLOADCMD in documentation # If you want replace wget with another downloader search DOWNLOADCMD in documentation

1
src/slackpkgplus.x86_64.sample
View file

@ -45,6 +45,7 @@ LEGACYBL=off
# Add custom option to 'wget'. # Add custom option to 'wget'.
# You can solve the repository indisponibility issue by set a timeout here # You can solve the repository indisponibility issue by set a timeout here
# Also add "-q" for super terse output (useful with USETERSE=on)
WGETOPTS="--timeout=20 --tries=2" WGETOPTS="--timeout=20 --tries=2"
# If you want replace wget with another downloader search DOWNLOADCMD in documentation # If you want replace wget with another downloader search DOWNLOADCMD in documentation

8
src/zlookkernel.sh
View file

@ -70,7 +70,7 @@ lookkernel() {
if [ "$ORIKERNELMD5" != "$NEWKERNELMD5" ]; then if [ "$ORIKERNELMD5" != "$NEWKERNELMD5" ]; then
KERNEL=$(readlink $PLUGIN_ZLOOKKERNEL_IMAGE | sed 's/.*-\([1-9]\)/\1/') KERNEL=$(readlink $PLUGIN_ZLOOKKERNEL_IMAGE | sed 's/.*-\([1-9]\)/\1/')
echo -e "\nYour kernel image was updated (found $KERNEL). You have to rebuild the bootloader.\nDo you want slackpkg to do it? (Y/n)" echo -e "\nYour kernel image was updated (found $KERNEL). You have to rebuild the bootloader.\nDo you want slackpkg to do it? (Y/n)"
answer [ ! "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then
INITRD=/boot/initrd.gz INITRD=/boot/initrd.gz
if [ -e /boot/initrd-tree/command_line ];then if [ -e /boot/initrd-tree/command_line ];then
@ -82,7 +82,7 @@ lookkernel() {
MKINITRD=$(sed -e "s/ *-k *[^ ]\+//g" -e "s/ *$/ -k $KERNEL/" /boot/initrd-tree/command_line) MKINITRD=$(sed -e "s/ *-k *[^ ]\+//g" -e "s/ *$/ -k $KERNEL/" /boot/initrd-tree/command_line)
echo " $MKINITRD" echo " $MKINITRD"
echo "Do you want continue? (Y/n)" echo "Do you want continue? (Y/n)"
[ "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer [ ! "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then
$MKINITRD $MKINITRD
if [ ! -d "/boot/initrd-tree/lib/modules/$KERNEL" ];then if [ ! -d "/boot/initrd-tree/lib/modules/$KERNEL" ];then
@ -100,7 +100,7 @@ lookkernel() {
for tocopy in vmlinuz vmlinuz-generic vmlinuz-huge `basename $PLUGIN_ZLOOKKERNEL_IMAGE` `basename $INITRD`;do for tocopy in vmlinuz vmlinuz-generic vmlinuz-huge `basename $PLUGIN_ZLOOKKERNEL_IMAGE` `basename $INITRD`;do
if [ -e /boot/$tocopy ]&&[ -e /boot/efi/EFI/Slackware/$tocopy ]&&grep -E -q "= *$tocopy *$" /boot/efi/EFI/Slackware/elilo.conf ;then if [ -e /boot/$tocopy ]&&[ -e /boot/efi/EFI/Slackware/$tocopy ]&&grep -E -q "= *$tocopy *$" /boot/efi/EFI/Slackware/elilo.conf ;then
echo "Do you want to copy $tocopy to EFI partition? (Y/n)" echo "Do you want to copy $tocopy to EFI partition? (Y/n)"
[ "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer [ ! "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then
cp -v /boot/$tocopy /boot/efi/EFI/Slackware/$tocopy && COPYDONE="$COPYDONE $tocopy" cp -v /boot/$tocopy /boot/efi/EFI/Slackware/$tocopy && COPYDONE="$COPYDONE $tocopy"
touch -r /boot/$tocopy /boot/efi/EFI/Slackware/$tocopy touch -r /boot/$tocopy /boot/efi/EFI/Slackware/$tocopy
@ -113,7 +113,7 @@ lookkernel() {
fi fi
elif [ -x /sbin/lilo ]&&[ -e /etc/lilo.conf ]; then elif [ -x /sbin/lilo ]&&[ -e /etc/lilo.conf ]; then
echo -e "\nFound lilo. Do you want to run now: /sbin/lilo ? (Y/n)" echo -e "\nFound lilo. Do you want to run now: /sbin/lilo ? (Y/n)"
[ "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer [ ! "$PLUGIN_ZLOOKKERNEL_PROMPT" == "off" ] && answer
if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then
if ! /sbin/lilo -t ;then if ! /sbin/lilo -t ;then
echo "You need to fix your lilo configuration NOW. Then press return to continue." echo "You need to fix your lilo configuration NOW. Then press return to continue."