Changeset 9b99ada for jhalfs

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:

• jhalfs (modified) (1 diff)

jhalfs

@@ -244 +244 @@
 #  check_blfs_tools
   simple_message "${SD_BORDER}${nl_}"
-  BLFS_GIT=${BLFS_GIT:-n}
+  BLFS_BRANCH=${BLFS_BRANCH:-n}
   BLFS_WORKING_COPY=${BLFS_WORKING_COPY:-n}
-  BLFS_BRANCH=${BLFS_BRANCH:-n}
-  if [[ "${BLFS_GIT}" = "y" ]]; then
-    BLFS_BRANCH_ID=development
-    BLFS_TREE=trunk
-  elif [[ "${BLFS_WORKING_COPY}" = "y" ]]; then
-    if [[ ! -d "$BLFS_WC_LOCATION/postlfs" ]] ; then
+  if [[ "${BLFS_WORKING_COPY}" = "y" ]] &&
+     [[ ! -d "$BLFS_WC_LOCATION/postlfs" ]] ; then
       echo " BLFS tools: This is not a working copy: $BLFS_WC_LOCATION."
       echo " Please rerun make and fix the configuration."
       exit 2
-    fi
-    BLFS_TREE=$(cd $BLFS_WC_LOCATION; git branch --show-current)
-    BLFS_BRANCH_ID=${BLFS_TREE/trunk/development}
-  elif [[ "${BLFS_BRANCH}" = "y" ]] ; then
-    case $BLFS_BRANCH_ID in
-           *EDIT* )  echo " You forgot to set the BLFS branch or stable book version."
-                     echo " Please rerun make and fix the configuration."
-                     exit 2 ;;
-                * )  BLFS_TREE=${BLFS_BRANCH_ID#branch-}
-    esac
   fi
   load_file "${COMMON_DIR}/libs/func_install_blfs"