From 7b52bfb8d5cc8f8688d0eed87de4bf3c3e725872 Mon Sep 17 00:00:00 2001 From: Tristan Terpelle Date: Fri, 23 Sep 2022 22:03:35 +0200 Subject: [PATCH 1/4] Add SLACKCFVERSION as a config option --- files/core-functions.sh | 2 ++ files/slackpkg.conf.new | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/files/core-functions.sh b/files/core-functions.sh index 56314e9..1634ba9 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -160,7 +160,9 @@ function system_setup() { # ${CONF}/blacklist. [ "$CMD" != update ] && mkregex_blacklist + if [ -z "${SLACKCFVERSION}" ]; then SLACKCFVERSION=$(grep "# v[0-9.]\+" $CONF/slackpkg.conf | cut -f2 -dv) + fi CHECKSUMSFILE=${WORKDIR}/CHECKSUMS.md5 KERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null) DIALOG_MAXARGS=${DIALOG_MAXARGS:-19500} diff --git a/files/slackpkg.conf.new b/files/slackpkg.conf.new index cbc845d..ec49f2e 100644 --- a/files/slackpkg.conf.new +++ b/files/slackpkg.conf.new @@ -64,6 +64,10 @@ # as needed #SLACKKEY="Slackware Linux Project " +# SLACKCFVERSION defines the Slackware version. If left commented, it +# will be parsed from the 4th line of thise unedited config file. +#SLACKCFVERSION=15.0 + # Downloaded files will be in the TEMP directory: TEMP=/var/cache/packages From 762587f6840a06904ba783ac919130ffc5e33bcd Mon Sep 17 00:00:00 2001 From: Tristan Terpelle Date: Fri, 23 Sep 2022 22:07:54 +0200 Subject: [PATCH 2/4] Fix typo --- files/slackpkg.conf.new | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/slackpkg.conf.new b/files/slackpkg.conf.new index ec49f2e..d5154e0 100644 --- a/files/slackpkg.conf.new +++ b/files/slackpkg.conf.new @@ -65,7 +65,7 @@ #SLACKKEY="Slackware Linux Project " # SLACKCFVERSION defines the Slackware version. If left commented, it -# will be parsed from the 4th line of thise unedited config file. +# will be parsed from the 4th line of this unedited config file. #SLACKCFVERSION=15.0 # Downloaded files will be in the TEMP directory: From 7fbd7d6a5114645a6a8c9588df2f5899d80fe265 Mon Sep 17 00:00:00 2001 From: Tristan Terpelle Date: Fri, 23 Sep 2022 22:09:03 +0200 Subject: [PATCH 3/4] Fix alignment (?) --- files/core-functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/core-functions.sh b/files/core-functions.sh index 1634ba9..4cf72bc 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -160,9 +160,9 @@ function system_setup() { # ${CONF}/blacklist. [ "$CMD" != update ] && mkregex_blacklist - if [ -z "${SLACKCFVERSION}" ]; then + if [ -z "${SLACKCFVERSION}" ]; then SLACKCFVERSION=$(grep "# v[0-9.]\+" $CONF/slackpkg.conf | cut -f2 -dv) - fi + fi CHECKSUMSFILE=${WORKDIR}/CHECKSUMS.md5 KERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null) DIALOG_MAXARGS=${DIALOG_MAXARGS:-19500} From f7ba8207a69e5a50c9f4e7ab72e4500709ee2b02 Mon Sep 17 00:00:00 2001 From: Tristan Terpelle Date: Fri, 23 Sep 2022 22:11:05 +0200 Subject: [PATCH 4/4] Fix alignment again --- files/core-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/core-functions.sh b/files/core-functions.sh index 4cf72bc..453fae3 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -161,7 +161,7 @@ function system_setup() { [ "$CMD" != update ] && mkregex_blacklist if [ -z "${SLACKCFVERSION}" ]; then - SLACKCFVERSION=$(grep "# v[0-9.]\+" $CONF/slackpkg.conf | cut -f2 -dv) + SLACKCFVERSION=$(grep "# v[0-9.]\+" $CONF/slackpkg.conf | cut -f2 -dv) fi CHECKSUMSFILE=${WORKDIR}/CHECKSUMS.md5 KERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null)