Author: pierre Date: Wed Aug 9 07:00:58 2017 New Revision: 3990 Log: Fix whether BLFS_TREE contains BOOK according to branch or tag
Modified: jhalfs/trunk/install-blfs-tools.sh jhalfs/trunk/jhalfs Modified: jhalfs/trunk/install-blfs-tools.sh ============================================================================== --- jhalfs/trunk/install-blfs-tools.sh Wed Aug 9 06:55:55 2017 (r3989) +++ jhalfs/trunk/install-blfs-tools.sh Wed Aug 9 07:00:58 2017 (r3990) @@ -132,13 +132,17 @@ [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}" 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 case $LFS_BRANCH_ID in development ) LFS_TREE=trunk/BOOK ;; + branch-6.* ) LFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;; branch-* ) LFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;; + 6.* ) LFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;; * ) LFS_TREE=tags/${BLFS_BRANCH_ID} ;; esac Modified: jhalfs/trunk/jhalfs ============================================================================== --- jhalfs/trunk/jhalfs Wed Aug 9 06:55:55 2017 (r3989) +++ jhalfs/trunk/jhalfs Wed Aug 9 07:00:58 2017 (r3990) @@ -176,7 +176,7 @@ lfs ) 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 ;; @@ -295,9 +295,9 @@ *EDIT* ) echo " You forgot to set the BLFS branch or stable book version." 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 fi -- http://lists.linuxfromscratch.org/listinfo/alfs-log Unsubscribe: See the above information page