From 2bd2fb81d0a45b0d60eaaf54ba6439547a422e98 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Wed, 30 Mar 2022 14:49:43 +0200
Subject: [PATCH] Replace $PROGNAME-commands with $COMMANDS

This allows to remove some references to PROGNAME
---
 LFS/master.sh                 | 2 +-
 README.CUSTOM                 | 2 +-
 common/libs/func_book_parser  | 8 ++++----
 common/libs/func_wrt_Makefile | 6 +++---
 jhalfs                        | 1 +
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/LFS/master.sh b/LFS/master.sh
index 4f80a52..ba59c1e 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -228,7 +228,7 @@ build_Makefile() {           #
 
   echo "Creating Makefile... ${BOLD}START${OFF}"
 
-  cd $JHALFSDIR/${PROGNAME}-commands
+  cd "$JHALFSDIR/$COMMANDS"
 
   # Start with empty files
   >$MKFILE
diff --git a/README.CUSTOM b/README.CUSTOM
index 61579c1..98ab9c4 100644
--- a/README.CUSTOM
+++ b/README.CUSTOM
@@ -34,7 +34,7 @@ able to boot and run. Each of those areas are handled in a different way.
 do that, configure jhalfs activating any option you want included, but do not
 select "Run the Makefile" option.
 
-  Under the ${BUILD_DIR}/${SCRIPT_ROOT}/${PROGNAME}-commands directory
+  Under the ${BUILD_DIR}/${SCRIPT_ROOT}/$COMMANDS directory
 (using the defaults values to do an LFS build, that directory name is
 /mnt/build_dir/jhalfs/lfs-commands) you will find the default build scripts.
 
diff --git a/common/libs/func_book_parser b/common/libs/func_book_parser
index d4c39df..cf1390f 100644
--- a/common/libs/func_book_parser
+++ b/common/libs/func_book_parser
@@ -46,7 +46,7 @@ extract_commands() {         #
 
   cd $JHALFSDIR
   # Clean
-  rm -rf ${PROGNAME}-commands
+  rm -rf "$COMMANDS"
 
   # Extract the commands
   echo -n "Extracting commands for"
@@ -106,12 +106,12 @@ extract_commands() {         #
                  --stringparam local          "$LOCAL"        \
                  --stringparam log-level      "$LOG_LEVEL"    \
                  --stringparam script-root    "$SCRIPT_ROOT"  \
-                 --output ./${PROGNAME}-commands/             \
+                 --output "./${COMMANDS}/"                    \
                  $XSL                                         \
                  prbook.xml >> $LOGDIR/$LOG 2>&1
 # Remove flags requesting user action in some cases. Much easier here than
 # in the stylesheet...
-        sed -i 's/-iv /-v /' ./${PROGNAME}-commands/chapter??/*kernel*
+        sed -i 's/-iv /-v /' "./${COMMANDS}/"chapter??/*kernel*
       ;;
     *)  echo -n " ${L_arrow}${PROGNAME}${R_arrow} book invalid, terminate build... "
         exit 1 ;;
@@ -120,7 +120,7 @@ extract_commands() {         #
   echo "done"
 
   # Make the scripts executable.
-  chmod -R +x $JHALFSDIR/${PROGNAME}-commands
+  chmod -R +x "$JHALFSDIR/${COMMANDS}"
 
   # Create the packages file. We need it for proper Makefile creation
   # lfs does not use this anymore, but this is taken care in the
diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile
index 8562b70..15ef469 100644
--- a/common/libs/func_wrt_Makefile
+++ b/common/libs/func_wrt_Makefile
@@ -25,11 +25,11 @@ SCRIPT_ROOT    = $SCRIPT_ROOT
 
 BASEDIR        = \$(MOUNT_PT)
 SRCSDIR        = \$(BASEDIR)/sources
-CMDSDIR        = \$(BASEDIR)/\$(SCRIPT_ROOT)/$PROGNAME-commands
+CMDSDIR        = \$(BASEDIR)/\$(SCRIPT_ROOT)/$COMMANDS
 LOGDIR         = \$(BASEDIR)/\$(SCRIPT_ROOT)/$LOGDIRBASE
 TESTLOGDIR     = \$(BASEDIR)/\$(SCRIPT_ROOT)/$TESTLOGDIRBASE
 
-crCMDSDIR      = /\$(SCRIPT_ROOT)/$PROGNAME-commands
+crCMDSDIR      = /\$(SCRIPT_ROOT)/$COMMANDS
 crLOGDIR       = /\$(SCRIPT_ROOT)/$LOGDIRBASE
 crTESTLOGDIR   = /\$(SCRIPT_ROOT)/$TESTLOGDIRBASE
 crFILELOGDIR   = /\$(SCRIPT_ROOT)/$FILELOGDIRBASE
@@ -215,7 +215,7 @@ wrt_RunAsRoot() {                  # Some scripts must be run as root..
 (
 cat << EOF
 	@export LFS=\$(MOUNT_PT) && \\
-	${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@$version 2>&1
+	$COMMANDS/`dirname $file`/\$@ >>logs/\$@$version 2>&1
 EOF
 ) >> $MKFILE.tmp
 }
diff --git a/jhalfs b/jhalfs
index 9cac0f7..eaa58ae 100755
--- a/jhalfs
+++ b/jhalfs
@@ -200,6 +200,7 @@ BOOK=${BOOK:=$JHALFSDIR/book-source}
 # shellcheck disable=SC2034
 declare -r REPO=git://git.linuxfromscratch.org/lfs.git
 declare -r LOG=000-masterscript.log
+declare -r COMMANDS=lfs-commands
 
 # Set true internal variables
 COMMON_DIR="common"