Changeset 380c2c6

Timestamp:

05/01/2021 03:26:37 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, legacy, trunk

Children:

203e4c2

Parents:

34c47be

Message:

jhalfs: manage version.ent vs general.ent

Old commits do not have git-version.sh, so version.ent cannot be generated
and general.ent has to be used

File:

• jhalfs (modified) (1 diff)

jhalfs

@@ -477 +477 @@
       VERSION=$(xmllint --noent "$BOOK/prologue/$ARCH/bookinfo.xml" 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
     lfs)
+      version_is_in=general.ent
+      if [ -x $BOOK/git-version.sh ]; then
+        ( cd $BOOK && ./git-version.sh )
+        version_is_in=version.ent
+      fi
       if [[ "$INITSYS" = "sysv" ]] ; then
-        VERSION=$(grep 'ENTITY version ' "$BOOK/general.ent" | cut -d\" -f2)
+        VERSION=$(grep 'ENTITY version ' "$BOOK/$version_is_in" | cut -d\" -f2)
       else
-        VERSION=$(grep 'ENTITY versiond' "$BOOK/general.ent" | cut -d\" -f2)
+        VERSION=$(grep 'ENTITY versiond' "$BOOK/$version_is_in" | cut -d\" -f2)
       fi
       ;;