- Timestamp:
- 03/30/2022 12:26:41 PM (2 years ago)
- Branches:
- ablfs-more, trunk
- Children:
- 2bd2fb8
- Parents:
- 9f89fae
- Location:
- common/libs
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
common/libs/func_book_parser
r9f89fae r2fd624d 6 6 cd $JHALFSDIR 7 7 8 if [ -z $WORKING_COPY] ; then8 if [ -z "$WORKING_COPY" ] ; then 9 9 # Check for Subversion or git instead of just letting the script fail. 10 10 test `type -p git` || eval "echo \"This feature requires Git.\" 11 11 exit 1" 12 12 13 echo -n "Downloading the $PROGNAME document, $LFSVRS version... "13 echo -n "Downloading the lfs document, $COMMIT commit... " 14 14 15 15 # Grab a fresh book if it's missing, otherwise, update it from the 16 16 # repo. If we've already extracted the commands, move on to getting the 17 17 # sources. 18 if [ ! -d ${PROGNAME}-${LFSVRS}/.git ]; then19 git clone $REPO ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG2>&120 if [ ! $TREE == "development"]; then21 pushd ${PROGNAME}-$LFSVRS >/dev/null22 echo "Checking out $ LFSVRS at $PWD in $TREE"23 git checkout ${TREE} >>$LOGDIR/$LOG2>&124 popd > 18 if [ ! -d "$BOOK"/.git ]; then 19 git clone "$REPO" "$BOOK" >>"$LOGDIR/$LOG" 2>&1 20 if [ "$COMMIT" != trunk ]; then 21 pushd "$BOOK" >/dev/null 22 echo "Checking out $COMMIT at $PWD" 23 git checkout "$COMMIT" >>"$LOGDIR/$LOG" 2>&1 24 popd >/dev/null 25 25 fi 26 26 else 27 cd ${PROGNAME}-$LFSVRS27 cd "$BOOK" 28 28 # If the repo is in "detached head" state, git pull fails, so get 29 # back first to master:30 git checkout trunk >> $LOGDIR/$LOG2>&131 git pull >> $LOGDIR/$LOG2>&132 if [ ! $TREE == "development" ]; then33 git checkout ${TREE} >>$LOGDIR/$LOG2>&129 # back first to trunk: 30 git checkout trunk >>"$LOGDIR/$LOG" 2>&1 31 git pull >>"$LOGDIR/$LOG" 2>&1 32 if [ "$COMMIT" != "trunk" ]; then 33 git checkout "$COMMIT" >>"$LOGDIR/$LOG" 2>&1 34 34 fi 35 35 fi -
common/libs/func_install_blfs
r9f89fae r2fd624d 50 50 TRACKING_DIR=$BUILDDIR$TRACKING_DIR \ 51 51 LFS_XML=$BUILDDIR$BLFS_ROOT/$LFS_XML \ 52 LFS-BRANCH= ${LFS_TREE}\52 LFS-BRANCH="${COMMIT}" \ 53 53 BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML \ 54 54 BLFS-BRANCH=${BLFS_TREE} \
Note:
See TracChangeset
for help on using the changeset viewer.