summaryrefslogtreecommitdiff
path: root/source/a/pkgtools/scripts
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-01-22 22:53:32 +0000
committerEric Hameleers <alien@slackware.com>2020-01-23 08:59:50 +0100
commit4f9273afa49a94b04bccc088fb87fec9d80a3fc6 (patch)
tree4d72218eb61e88572100270416cc562159676018 /source/a/pkgtools/scripts
parent24375111b1a4c62f9b704108e98f53002f8c448a (diff)
downloadcurrent-4f9273afa49a94b04bccc088fb87fec9d80a3fc6.tar.gz
Wed Jan 22 22:53:32 UTC 202020200122225332
a/kernel-firmware-20200122_1eb2408-noarch-1.txz: Upgraded. a/pciutils-3.6.3-x86_64-1.txz: Upgraded. a/pkgtools-15.0-noarch-30.txz: Rebuilt. removepkg: prevent upgradepkg noise when a directory turns into a symlink. setup.vi-ex: don't make symlinks if the targets don't exist. d/cmake-3.16.3-x86_64-1.txz: Upgraded. d/distcc-3.3.3-x86_64-3.txz: Rebuilt. Move symlink tree into /usr/lib/distcc/, and make a link in /usr/lib64/ if needed. Seems like this is how everyone else sets it up. Thanks to hpfeil. Recompiled against krb5-1.17.1 (--with-auth). d/parallel-20200122-noarch-1.txz: Upgraded. l/python-urllib3-1.25.8-x86_64-1.txz: Upgraded. n/bind-9.14.10-x86_64-1.txz: Upgraded. This is a bugfix release: With some libmaxminddb versions, named could erroneously match an IP address not belonging to any subnet defined in a given GeoIP2 database to one of the existing entries in that database. [GL #1552] Fix line spacing in `rndc secroots`. Thanks to Tony Finch. [GL #2478] Recompiled against krb5-1.17.1 (--with-gssapi). n/dhcp-4.4.2-x86_64-1.txz: Upgraded. n/p11-kit-0.23.19-x86_64-1.txz: Upgraded. n/php-7.4.2-x86_64-2.txz: Rebuilt. Patched for c-client library API change. Thanks to ecd102. Recompiled against krb5-1.17.1 (--with-kerberos).
Diffstat (limited to 'source/a/pkgtools/scripts')
-rw-r--r--source/a/pkgtools/scripts/removepkg2
-rw-r--r--source/a/pkgtools/scripts/setup.vi-ex27
2 files changed, 24 insertions, 5 deletions
diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg
index b033eebf..d94031dc 100644
--- a/source/a/pkgtools/scripts/removepkg
+++ b/source/a/pkgtools/scripts/removepkg
@@ -276,7 +276,7 @@ delete_dirs() {
if [ ! "$WARN" = "true" ]; then
if [ $(ls -a "$ROOT/$DIR" | wc -l) -eq 2 ]; then
! [ $TERSE ] && echo " --> Deleting empty directory $ROOT/$DIR"
- rmdir "$ROOT/$DIR"
+ rmdir "$ROOT/$DIR" 2> /dev/null # Using 2> /dev/null to prevent noise from upgradepkg when a directory changes to a symlink.
else
! [ $TERSE ] && echo "WARNING: Unique directory $ROOT/$DIR contains new files"
fi
diff --git a/source/a/pkgtools/scripts/setup.vi-ex b/source/a/pkgtools/scripts/setup.vi-ex
index f58c15e0..f79ad91e 100644
--- a/source/a/pkgtools/scripts/setup.vi-ex
+++ b/source/a/pkgtools/scripts/setup.vi-ex
@@ -11,7 +11,7 @@ as it is lightweight and supports UTF8. You may choose a different default \
if you prefer, but please note that elvis does not support UTF8." 14 76 3 \
"elvis" "Slackware's traditional ex/vi, no UTF8 support" \
"nvi" "Classic BSD ex/vi, supports UTF8" \
-"vim" "VI Improved - top rated ex/vi clone, supports UTF8" \
+"vim" "Vi IMproved - top rated ex/vi clone, supports UTF8" \
2> $TMP/exvitype
if [ ! $? = 0 ]; then
rm -f $TMP/exvitype
@@ -22,10 +22,29 @@ if [ -f $TMP/exvitype ]; then
else
exit 0
fi
+# Only make the symlinks if the targets actually exist.
if [ "$DEFAULT_VI" = "elvis" ]; then
- ( cd $T_PX/usr/bin ; rm -f ex vi ; ln -sf elvis ex ; ln -sf elvis vi )
+ ( cd $T_PX/usr/bin
+ if [ -e elvis ]; then
+ rm -f ex vi
+ ln -sf elvis ex
+ ln -sf elvis vi
+ fi
+ )
elif [ "$DEFAULT_VI" = "nvi" ]; then
- ( cd $T_PX/usr/bin ; rm -f ex vi ; ln -sf nex ex ; ln -sf nvi vi )
+ ( cd $T_PX/usr/bin
+ if [ -e nex -a -e nvi ]; then
+ rm -f ex vi
+ ln -sf nex ex
+ ln -sf nvi vi
+ fi
+ )
elif [ "$DEFAULT_VI" = "vim" ]; then
- ( cd $T_PX/usr/bin ; rm -f ex vi ; ln -sf vim ex ; ln -sf vim vi )
+ ( cd $T_PX/usr/bin
+ if [ -e vim ]; then
+ rm -f ex vi
+ ln -sf vim ex
+ ln -sf vim vi
+ fi
+ )
fi