Changeset de67016

Timestamp:

04/30/2021 12:21:44 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, legacy, trunk

Children:

dfab075

Parents:

dd5d63d

Message:

Adapt func_book_parser to git

The variable name "TREE" makes no sense now. It is rather a branch or a tag.
So more work is needed here.

File:

• common/libs/func_book_parser (modified) (3 diffs)

common/libs/func_book_parser

@@ -10 +10 @@
   if [ -z $WORKING_COPY ] ; then
 # Check for Subversion or git instead of just letting the script fail.
+    test `type -p git` || eval "echo \"This feature requires Git.\"
+    exit 1"
+
+    echo -n "Downloading the $PROGNAME document, $LFSVRS version... "
+
     case $PROGNAME in
-      lfs | hlfs)
-        test `type -p svn` || eval "echo \"This feature requires Subversion.\"
-        exit 1"
-      ;;
-      clfs*)
-        test `type -p git` || eval "echo \"This feature requires Git.\"
-        exit 1"
-      ;;
-    esac
-
-    echo -n "Downloading the $PROGNAME document, $LFSVRS version... "
-
-    case $PROGNAME in
-      lfs) svn_root="LFS" ;;
-      hlfs) svn_root="HLFS" ;;
+      lfs) git_root="lfs.git" ;;
       clfs*) ;;
       *) echo "BOOK not defined in function <get_book>"
@@ -33 +24 @@
     # repo. If we've already extracted the commands, move on to getting the
     # sources.
-    if [ $PROGNAME == "lfs" ] || [ $PROGNAME == "hlfs" ] &&
-                                 [ ! -d ${PROGNAME}-${LFSVRS}/.svn ]; then
-        svn co $SVN/${svn_root}/${TREE} ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1
-    elif [ $PROGNAME == "clfs" ]  || [ $PROGNAME == "clfs2" ] ||
-         [ $PROGNAME == "clfs3" ] && [ ! -d ${PROGNAME}-${LFSVRS}/.git ]; then
-        echo $TREE
+    if [ ! -d ${PROGNAME}-${LFSVRS}/.git ]; then
         git clone $GIT ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1
         if [ ! $TREE == "development" ]; then
@@ -48 +34 @@
     else
       cd ${PROGNAME}-$LFSVRS
-      case $PROGNAME in
-        clfs*)
-          # If the repo is in "detached head" state, git pull fails, so get
-          # back first to master:
-          git checkout master >>$LOGDIR/$LOG 2>&1
-          git pull >>$LOGDIR/$LOG 2>&1
-              if [ ! $TREE == "development" ]; then
-                 git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
-              fi
-        ;;
-        lfs | hlfs) svn up >>$LOGDIR/$LOG 2>&1 ;;
-        *) ;;
-      esac
+      # If the repo is in "detached head" state, git pull fails, so get
+      # back first to master:
+      git checkout trunk >>$LOGDIR/$LOG 2>&1
+      git pull >>$LOGDIR/$LOG 2>&1
+      if [ ! $TREE == "development" ]; then
+         git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
+      fi
     fi
     echo -ne "done\n"