Changeset 9b99ada for install-blfs-tools.sh

Timestamp:

04/01/2022 08:26:17 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

924a237

Parents:

30a444a

Message:

Change variable names and logic for BLFS book

Only use BLFS_COMMIT instead of BLFS_BRANCH_ID, BLFS_TREE, BLFS_BOOK
Same for le LFS_BLFS variables

File:

• install-blfs-tools.sh (modified) (6 diffs)

install-blfs-tools.sh

@@ -11 +11 @@
 BLFS_ROOT     : where the installed tools will be installed, relative to $HOME.
                 Must start with a '/' (default /blfs_root)
-BLFS_BRANCH_ID: development, branch-xxx, xxx (where xxx is a valid tag)
-                (default development)
-LFS_BRANCH_ID : development, branch-xxx, xxx (where xxx is a valid tag)
-                (default development)
+BLFS_COMMIT   : any commit (branch/tag/sha)
+                (default trunk)
+LFS_COMMIT    : any commit (branch/tag/sha)
+                (default trunk)
 Examples:
 1 - If you plan to use the tools to build BLFS on top of LFS, but you did not
@@ -68 +68 @@
 if [ "$BOOK_BLFS" = y ]; then
 ## Read variables and sanity checks
-  [[ "$relGIT" = y ]] && BLFS_BRANCH_ID=development
-  [[ "$BRANCH" = y ]] && BLFS_BRANCH_ID=$BRANCH_ID
+  [[ "$BRANCH" = y ]] && BLFS_COMMIT=$COMMIT
   [[ "$WORKING_COPY" = y ]] && BLFS_BOOK=$BOOK
-  [[ "$BRANCH_ID" = "**EDIT ME**" ]] &&
-    echo You have not set the BLFS book version or branch && exit 1
   [[ "$BOOK" = "**EDIT ME**" ]] &&
     echo You have not set the BLFS working copy location && exit 1
-  [[ "$LFS_relGIT" = y ]] && LFS_BRANCH_ID=development
-  [[ "$LFS_BRANCH" = y ]] && LFS_BRANCH_ID=$BLFS_LFS_BRANCH_ID
+  [[ "$LFS_BRANCH" = y ]] && LFS_COMMIT=$BLFS_LFS_COMMIT
   [[ "$LFS_WORKING_COPY" = y ]] && LFS_BOOK=$BLFS_LFS_BOOK
-  [[ "$LFS_BRANCH_ID" = "**EDIT ME**" ]] &&
-    echo You have not set the LFS book version or branch && exit 1
   [[ "$LFS_BOOK" = "**EDIT ME**" ]] &&
     echo You have not set the LFS working copy location && exit 1
@@ -91 +85 @@
 TRACKING_DIR="${TRACKING_DIR:=/var/lib/jhalfs/BLFS}"
 INITSYS="${INITSYS:=sysv}"
-BLFS_BRANCH_ID=${BLFS_BRANCH_ID:=development}
-LFS_BRANCH_ID=${LFS_BRANCH_ID:=development}
+BLFS_COMMIT=${BLFS_COMMIT:=trunk}
+LFS_COMMIT=${LFS_COMMIT:=trunk}
 BLFS_XML=${BLFS_XML:=blfs-xml}
 LFS_XML=${LFS_XML:=lfs-xml}
@@ -101 +95 @@
   PARAMS="$PARAMS WORKING_COPY BLFS_BOOK"
 else
-  PARAMS="$PARAMS BLFS_BRANCH_ID"
+  PARAMS="$PARAMS BLFS_COMMIT"
 fi
 if [ "$LFS_WORKING_COPY" = y ]; then
   PARAMS="$PARAMS LFS_WORKING_COPY LFS_BOOK"
 else
-  PARAMS="$PARAMS LFS_BRANCH_ID"
+  PARAMS="$PARAMS LFS_COMMIT"
 fi
 # Format for displaying parameters:
@@ -131 +125 @@
 
 [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
-
-case $BLFS_BRANCH_ID in
-     development )  BLFS_TREE=trunk ;;
-        branch-* )  BLFS_TREE=${BLFS_BRANCH_ID#branch-} ;;
-               * )  BLFS_TREE=${BLFS_BRANCH_ID} ;;
-esac
-case $LFS_BRANCH_ID in
-  development )  LFS_TREE=trunk ;;
-     branch-* )  LFS_TREE=${LFS_BRANCH_ID#branch-} ;;
-            * )  LFS_TREE=${LFS_BRANCH_ID} ;;
-esac
 
 # Check for build prerequisites.
@@ -194 +177 @@
      REV=$INITSYS            \
      LFS_XML=$BUILDDIR$BLFS_ROOT/$LFS_XML      \
-     LFS-GIT=git://git.linuxfromscratch.org/lfs.git \
-     LFS-BRANCH=${LFS_TREE}                      \
+     LFS-BRANCH=${LFS_COMMIT}                      \
      BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML      \
-     GIT=git://git.linuxfromscratch.org/blfs.git \
-     BLFS-BRANCH=${BLFS_TREE}                    \
+     BLFS-BRANCH=${BLFS_COMMIT}                    \
      $BUILDDIR$BLFS_ROOT/packages.xml
 [[ $VERBOSITY > 0 ]] && echo "... OK"