Changeset caee4df

Timestamp:

08/09/2017 02:06:53 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4

Children:

8d07ea6

Parents:

b99e56a

Message:

Merge trunk r3990

Files:

• install-blfs-tools.sh (modified) (1 diff)
• jhalfs (modified) (2 diffs)

install-blfs-tools.sh

@@ -117 +117 @@
 
 case $BLFS_BRANCH_ID in
-  development )  BLFS_TREE=trunk/BOOK ;;
-     branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
-            * )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
+     development )  BLFS_TREE=trunk/BOOK ;;
+      branch-6.* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
+        branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
+6.2* | 7.* | 8.* )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
+               * )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
 esac
 

jhalfs

@@ -174 +174 @@
         LFSVRS=${BRANCH_ID}
         TREE=branches/${BRANCH_ID#branch-}
-        if [ ${BRANCH_ID#branch-} = 6 ]; then
+        if [ ${BRANCH_ID:7:1} = 6 ]; then
             TREE=${TREE}/BOOK
         fi
@@ -293 +293 @@
                      echo " Please rerun make and fix the configuration."
                      exit 2 ;;
-   branch-systemd )  BLFS_TREE=branches/systemd ;;
-         branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
-       6.2* | 7.* )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
+       branch-6.* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
+         branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
+  6.2* | 7.* | 8.*)  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
                 * )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
     esac