diff options
Diffstat (limited to 'source')
13 files changed, 29 insertions, 34 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index fa87dcc7..b921d27b 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,6 @@ +Sat Jan 26 19:58:30 UTC 2019 + Fixed detecting FAT/NTFS partitions on UEFI systems. ++--------------------------+ Fri Jan 25 23:06:42 UTC 2019 Updated the elilo bootloaders in /EFI/BOOT which were older versions (possibly with the 8MB kernel size limit?) diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTDOS b/source/installer/sources/initrd/usr/lib/setup/SeTDOS index 4f9d1057..abcb4095 100755 --- a/source/installer/sources/initrd/usr/lib/setup/SeTDOS +++ b/source/installer/sources/initrd/usr/lib/setup/SeTDOS @@ -3,7 +3,7 @@ # More updates for Slackware 3.5: Wed Apr 29 22:43:28 CDT 1998 # Updated for Slackware 7.x (new fdisk tags) Fri Sep 10 13:17:18 CDT 1999 TMP=/var/log/setup/tmp -T_PX="`cat $TMP/SeTT_PX`" +T_PX="$(cat $TMP/SeTT_PX)" if [ ! -d $TMP ]; then mkdir -p $TMP fi @@ -85,7 +85,7 @@ if [ -L /dev/disk/by-label/USBSLACKINS ]; then fi # Suggested new GPT partition type: Microsoft basic data # More research needed... could be FAT32, NTFS, or EXFAT -DOSLIST="$(probe -l 2> /dev/null | grep -E "DOS|Win(95 F|98 F)|HPFS|W95 F|FAT(12|16)" | grep -Ev "Ext('d|end)" | grep -v "$BANHAMMER" | sort)" +DOSLIST="$(probe -l 2> /dev/null | grep -E "DOS|Win(95 F|98 F)|HPFS|W95 F|FAT(12|16)|Microsoft basic data" | grep -Ev "Ext('d|end)" | grep -v "$BANHAMMER" | sort)" if [ "$DOSLIST" = "" ]; then # no FAT or NTFS partitions exit fi @@ -113,19 +113,11 @@ process." \\ 15 70 5 \\ EOF echo "$DOSLIST" | while read PARTITION ; do - NAME=`echo $PARTITION | crunch | cut -f 1 -d ' '` - SIZE=`get_part_size $NAME` - if echo $PARTITION | grep Win9 1> $NDIR 2> $NDIR ; then - TYPE="FAT32" - elif echo $PARTITION | grep "W95 F" 1> $NDIR 2> $NDIR ; then - TYPE="FAT32" - elif echo $PARTITION | grep NTFS 1> $NDIR 2> $NDIR ; then - TYPE="NTFS" - elif echo $PARTITION | grep FAT 1> $NDIR 2> $NDIR ; then - TYPE="FAT16" - fi + NAME=$(echo $PARTITION | crunch | cut -f 1 -d ' ') + SIZE=$(get_part_size $NAME) + TYPE="$(blkid $NAME | tr ' ' '\n' | grep "^TYPE=" | cut -f 2- -d = | tr -d \")" if cat $TMP/SeTDOS | grep $NAME 1> $NDIR 2> $NDIR ; then - ON=`cat $TMP/SeTDOS | grep $NAME | crunch | cut -f 2 -d ' '` + ON=$(cat $TMP/SeTDOS | grep $NAME | crunch | cut -f 2 -d ' ') echo "\"(IN USE)\" \"$NAME on $ON $TYPE ${SIZE}\" \\" >> $TMP/tempscript else echo "\"$NAME\" \"$TYPE ${SIZE}\" \\" >> $TMP/tempscript @@ -138,7 +130,7 @@ EOF echo "\"---\" \"(done, continue with setup)\" \\" >> $TMP/tempscript echo "\"---\" \"(done, continue with setup)\" \\" >> $TMP/tempscript echo "2> $TMP/return" >> $TMP/tempscript - if [ "`cat $TMP/SeTSKIP`" = "true" ]; then + if [ "$(cat $TMP/SeTSKIP)" = "true" ]; then break fi . $TMP/tempscript @@ -146,7 +138,7 @@ EOF rm $TMP/tempscript exit 255 # user abort fi - DOS_PART="`cat $TMP/return`" + DOS_PART="$(cat $TMP/return)" rm -f $TMP/tempscript if [ "$DOS_PART" = "---" ]; then break @@ -184,13 +176,13 @@ EOF rm -f $TMP/tempmsg $TMP/mount-point $TMP/SeTDOS exit fi - NEW_DIR="`cat $TMP/mount-point`" + NEW_DIR="$(cat $TMP/mount-point)" rm -f $TMP/mount-point # If this was left blank or is '/', drop back to the first menu and start over. if [ "$NEW_DIR" = "" -o "$NEW_DIR" = "/" ]; then continue fi - if [ ! "`echo $NEW_DIR | cut -b1`" = "/" ]; then + if [ ! "$(echo $NEW_DIR | cut -b1)" = "/" ]; then NEW_DIR="/$NEW_DIR" fi mkdir -p ${T_PX}$NEW_DIR diff --git a/source/k/kernel-configs/config-generic-4.19.17 b/source/k/kernel-configs/config-generic-4.19.18 index 1a428c02..0ec313d0 100644 --- a/source/k/kernel-configs/config-generic-4.19.17 +++ b/source/k/kernel-configs/config-generic-4.19.18 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.17 Kernel Configuration +# Linux/x86 4.19.18 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.17.x64 b/source/k/kernel-configs/config-generic-4.19.18.x64 index c12dafbf..abef47ab 100644 --- a/source/k/kernel-configs/config-generic-4.19.17.x64 +++ b/source/k/kernel-configs/config-generic-4.19.18.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.17 Kernel Configuration +# Linux/x86 4.19.18 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.17-smp b/source/k/kernel-configs/config-generic-smp-4.19.18-smp index 10115c09..9c5d83d7 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.17-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.18-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.17 Kernel Configuration +# Linux/x86 4.19.18 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.17 b/source/k/kernel-configs/config-huge-4.19.18 index cda170ac..0a1da581 100644 --- a/source/k/kernel-configs/config-huge-4.19.17 +++ b/source/k/kernel-configs/config-huge-4.19.18 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.17 Kernel Configuration +# Linux/x86 4.19.18 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.17.x64 b/source/k/kernel-configs/config-huge-4.19.18.x64 index 4d769ba2..05648b01 100644 --- a/source/k/kernel-configs/config-huge-4.19.17.x64 +++ b/source/k/kernel-configs/config-huge-4.19.18.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.17 Kernel Configuration +# Linux/x86 4.19.18 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.17-smp b/source/k/kernel-configs/config-huge-smp-4.19.18-smp index e3c29acf..9deb7c43 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.17-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.18-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.17 Kernel Configuration +# Linux/x86 4.19.18 Kernel Configuration # # diff --git a/source/l/SDL2_ttf/SDL2_ttf.SlackBuild b/source/l/SDL2_ttf/SDL2_ttf.SlackBuild index f4b62637..0b569fc8 100755 --- a/source/l/SDL2_ttf/SDL2_ttf.SlackBuild +++ b/source/l/SDL2_ttf/SDL2_ttf.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=SDL2_ttf -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -75,7 +75,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . diff --git a/source/l/iso-codes/iso-codes.SlackBuild b/source/l/iso-codes/iso-codes.SlackBuild index 8ae50bf8..c371d8ed 100755 --- a/source/l/iso-codes/iso-codes.SlackBuild +++ b/source/l/iso-codes/iso-codes.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=iso-codes -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ARCH=${ARCH:-noarch} BUILD=${BUILD:-1} @@ -44,7 +44,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/l/iso-codes/slack-desc b/source/l/iso-codes/slack-desc index d169f2fe..6f5e9cc1 100644 --- a/source/l/iso-codes/slack-desc +++ b/source/l/iso-codes/slack-desc @@ -5,7 +5,7 @@ iso-codes: This package provides lists of various ISO standards (e.g. iso-codes: country, language, language scripts, and currency names) in one iso-codes: place, rather than repeated in many programs throughout the system. iso-codes: -iso-codes: Homepage: http://pkg-isocodes.alioth.debian.org/ +iso-codes: Homepage: https://salsa.debian.org/iso-codes-team/iso-codes iso-codes: iso-codes: iso-codes: diff --git a/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild b/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild index 894fabe2..46846db6 100755 --- a/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild +++ b/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcdio-paranoia -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -73,7 +73,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf libcdio-paranoia-$VERSION -tar xvf $CWD/libcdio-paranoia-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/libcdio-paranoia-$VERSION.tar.?z || exit 1 cd libcdio-paranoia-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/xfce/Thunar/Thunar.url b/source/xfce/Thunar/Thunar.url index bdd990f1..aae98af9 100644 --- a/source/xfce/Thunar/Thunar.url +++ b/source/xfce/Thunar/Thunar.url @@ -1 +1 @@ -http://archive.xfce.org/src/xfce/thunar/1.8/Thunar-1.8.2.tar.bz2 +http://archive.xfce.org/src/xfce/thunar/1.8/Thunar-1.8.3.tar.bz2 |