Fix whether BLFS_TREE contains BOOK according to branch or tag
This commit is contained in:
parent
506120eeec
commit
dd08e14af0
2 changed files with 11 additions and 7 deletions
|
@ -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
|
||||
|
||||
|
|
8
jhalfs
8
jhalfs
|
@ -176,7 +176,7 @@ case $BRANCH_ID in
|
|||
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 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
|
|||
*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
|
||||
|
|
Reference in a new issue