Changeset c4ad7bf

Timestamp:

05/08/2014 04:05:31 PM (10 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

ff9938f

Parents:

c6ee8ea

Message:

Make the use of branches clearer, and allow branches to be used
for CLFS

Files:

• Config.in (modified) (1 diff)
• jhalfs (modified) (2 diffs)

Config.in

@@ -66 +66 @@
 
         config  BRANCH_ID
-                string  "Book Version (mandatory)"
+                string  "Stable Version or branch (preceded by branch-)"
                 default "**EDIT ME**"
                 depends BRANCH
                 help
-                        #-- A list of valid branches and stable book IDs is available here.
+                        #-- A list of valid branches and stable book IDs is available here:
                         #   http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks
+                        #   Enter branch-XXX for branch XXX, and just YYY for tag YYY or
+                        #   stable YYY version
 
         config  BOOK

jhalfs

@@ -162 +162 @@
     case $PROGNAME in
       clfs* ) TREE="" ;;
-           *) TREE=trunk/BOOK ;;
+          * ) TREE=trunk/BOOK ;;
     esac
     LFSVRS=development
@@ -170 +170 @@
             exit 2 ;;
   branch-* )
-    LFSVRS=${BRANCH_ID}
-    TREE=branches/${BRANCH_ID#branch-}/BOOK
+    case $PROGNAME in
+      lfs )
+        LFSVRS=${BRANCH_ID}
+        TREE=branches/${BRANCH_ID#branch-}/BOOK
+        ;;
+      clfs* )
+        LFSVRS=${BRANCH_ID}
+        TREE=${BRANCH_ID#branch-}
+        ;;
+    esac
     ;;
   * )