Changeset 2bd2fb8 for common

Timestamp:

03/30/2022 12:49:43 PM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

8825e69

Parents:

2fd624d

Message:

Replace $PROGNAME-commands with $COMMANDS

This allows to remove some references to PROGNAME

Location:

common/libs

Files:

• func_book_parser (modified) (3 diffs)
• func_wrt_Makefile (modified) (2 diffs)

common/libs/func_book_parser

@@ -47 +47 @@
   cd $JHALFSDIR
   # Clean
-  rm -rf ${PROGNAME}-commands
+  rm -rf "$COMMANDS"
 
   # Extract the commands
@@ -107 +107 @@
                  --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... "
@@ -121 +121 @@
 
   # 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

common/libs/func_wrt_Makefile

@@ -26 +26 @@
 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
@@ -216 +216 @@
 cat << EOF
         @export LFS=\$(MOUNT_PT) && \\
-        ${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@$version 2>&1
+        $COMMANDS/`dirname $file`/\$@ >>logs/\$@$version 2>&1
 EOF
 ) >> $MKFILE.tmp