diff options
| author | Pierre Labastie <pierre@linuxfromscratch.org> | 2017-08-09 14:00:58 +0000 |
|---|---|---|
| committer | Pierre Labastie <pierre@linuxfromscratch.org> | 2017-08-09 14:00:58 +0000 |
| commit | dd08e14af0ea5ad369846d9a85709bdea907cf5b (patch) | |
| tree | 0c27b9409a6e1fffe755f0b69244f3cc73b98b12 /install-blfs-tools.sh | |
| parent | 506120eeecb9b41b1bd33bde498e0c365baa4285 (diff) | |
Fix whether BLFS_TREE contains BOOK according to branch or tag
Diffstat (limited to 'install-blfs-tools.sh')
| -rwxr-xr-x | install-blfs-tools.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/install-blfs-tools.sh b/install-blfs-tools.sh index dca8f47ea8..51cd92c18a 100755 --- a/install-blfs-tools.sh +++ b/install-blfs-tools.sh @@ -132,13 +132,17 @@ source $COMMON_DIR/libs/func_check_version.sh [[ $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 |