Merge pull request #15 from N6REJ/versioning

N6REJ · web-flow · commit 7a51db606c7e · 2025-06-08T19:51:04.000-05:00
Improve version generation logic and add Julian Clock language config…
diff --git a/.github/workflows/package-module.yml b/.github/workflows/package-module.yml
@@ -70,34 +70,34 @@ jobs:
           BASE_VERSION=$(date +'%Y.%m.%d')
           CREATION_DATE=$(date +'%Y %B %d')
           CURRENT_YEAR=$(date +'%Y')
-          
-          # Get all existing tags
-          git fetch --tags
-          
-          # Check if the base version tag already exists
-          if git rev-parse "$BASE_VERSION" >/dev/null 2>&1; then
-            echo "Tag $BASE_VERSION already exists, finding next available version..."
-            
-            # Find all tags that match the pattern {BASE_VERSION}.{n}
-            MATCHING_TAGS=$(git tag -l "$BASE_VERSION.*")
-            
-            if [ -z "$MATCHING_TAGS" ]; then
-              # No sub-versions exist, use .1
-              VERSION="${BASE_VERSION}.1"
-            else
-              # Find the highest sub-version
-              HIGHEST_SUBVERSION=$(echo "$MATCHING_TAGS" | sed "s/^$BASE_VERSION\.//" | sort -n | tail -1)
-              NEXT_SUBVERSION=$((HIGHEST_SUBVERSION + 1))
-              VERSION="${BASE_VERSION}.$NEXT_SUBVERSION"
-            fi
+
+          # Fetch all tags from remote to ensure we have the latest
+          git fetch --tags --force
+
+          # Find all tags that match the pattern BASE_VERSION or BASE_VERSION.n
+          TAGS=$(git tag -l "${BASE_VERSION}*" | sort -V)
+
+          if echo "$TAGS" | grep -qx "$BASE_VERSION"; then
+            # If the base version exists, find the highest subversion
+            HIGHEST_SUBVERSION=0
+            for tag in $TAGS; do
+              if [[ "$tag" =~ ^${BASE_VERSION}\.([0-9]+)$ ]]; then
+                SUBVER=${BASH_REMATCH[1]}
+                if (( SUBVER > HIGHEST_SUBVERSION )); then
+                  HIGHEST_SUBVERSION=$SUBVER
+                fi
+              fi
+            done
+            NEXT_SUBVERSION=$((HIGHEST_SUBVERSION + 1))
+            VERSION="${BASE_VERSION}.${NEXT_SUBVERSION}"
           else
             VERSION="$BASE_VERSION"
           fi
-          
+
           echo "Generated version: $VERSION"
           echo "Creation date: $CREATION_DATE"
           echo "Current year: $CURRENT_YEAR"
-          
+
           # Set outputs for use later
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "creation_date=$CREATION_DATE" >> $GITHUB_OUTPUT
diff --git a/language/en-GB/mod_julianclock.sys.ini b/language/en-GB/mod_julianclock.sys.ini
@@ -1,2 +1,14 @@
 MOD_JULIANCLOCK="Astronomical Julian Clock"
 MOD_JULIANCLOCK_DESC="A simple Julian Clock for Astronomers. Updated for Joomla 5 compatibility."
+MOD_JULIANCLOCK_CLOCK_TEXT_LABEL="Clock text"
+MOD_JULIANCLOCK_CLOCK_TEXT_DESC="This text will appear after the time.  Include spaces as desired"
+MOD_JULIANCLOCK_POSITION_TEXT_LABEL="Show Text before Date?"
+MOD_JULIANCLOCK_POSTION_TEXT_DESC="Will the text entered be shown before or after the time?"
+MOD_JULIANCLOCK_UPDATE_INTERVAL_LABEL="Update Interval"
+MOD_JULIANCLOCK_UPDATE_INTERVAL_DESC="How often would you like the clock to update? -  NOTE: Value is in milliseconds, there are 1000 milliseconds in a second?"
+MOD_JULIANCLOCK_ICON_LABEL="Icon Class"
+MOD_JULIANCLOCK_ICON_DESC="You can display a fontawesom, icon-moon, or glyphicon here by
+                          simply pasting in the class's given in the cheatsheet for the given icon.<br>For example, for a glyphicon asterisk you would enter <i>glyphicon glyphicon-asterisk</i>.<br>
+NOTE: The icon will ALWAYS appear on the far left"
+MOD_JULIANCLOCK_PRECISION_LABEL="Decimal Display"
+MOD_JULIANCLOCK_PRECISION_DESC="You may have up to a 10 digit decimal precision.  Choose the number of decimal places you wish to display.<br>NOTE: computations are done in 64bit values but rounded to 10 places."
