Testing again

Author: mastacontrola

.githooks/pre-commit

@@ -1,32 +1,25 @@
-#!/usr/bin/sh
+#!/usr/bin/env sh
 #
-# An example hook script to verify what is about to be committed.
-# Called by "git commit" with no arguments.  The hook should
-# exit with non-zero status after issuing an appropriate message if
-# it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-commit".
-#
-# Exit on error
+# Exit on error? You had this commented out; leaving it as-is.
 # set -e
 
 project_dir=$(git rev-parse --show-toplevel)
 
 psrfix() {
-    command -v php-cs-fixer >/dev/null || return
-    $(command -v php-cs-fixer) fix $project_dir/packages/web --rules=@PSR2
-    git add $project_dir/packages/web
+    command -v php-cs-fixer >/dev/null 2>&1 || return
+    "$(command -v php-cs-fixer)" fix "$project_dir/packages/web" --rules=@PSR2
+    git add "$project_dir/packages/web"
 }
 
 updateLanguage() {
-    command -v xgettext >/dev/null || return
-    command -v msgcat >/dev/null || return
-    command -v msgmerge >/dev/null || return
-    xgettext --language=PHP --from-code=UTF-8 --output="$project_dir/packages/web/management/languages/messages.pot" --omit-header --no-location $(find $project_dir/packages/web/ -name "*.php")
+    command -v xgettext >/dev/null 2>&1 || return
+    command -v msgcat   >/dev/null 2>&1 || return
+    command -v msgmerge >/dev/null 2>&1 || return
+    xgettext --language=PHP --from-code=UTF-8 --output="$project_dir/packages/web/management/languages/messages.pot" --omit-header --no-location $(find "$project_dir/packages/web/" -name "*.php")
     msgcat --sort-output -o "$project_dir/packages/web/management/languages/messages.pot" "$project_dir/packages/web/management/languages/messages.pot"
-    for PO_FILE in $(find $project_dir/packages/web/management/languages/ -type f -name *.po); do
-        msgmerge --update --backup=none $PO_FILE $project_dir/packages/web/management/languages/messages.pot 2>/dev/null >/dev/null
-        msgcat --sort-output -o $PO_FILE $PO_FILE
+    for PO_FILE in $(find "$project_dir/packages/web/management/languages/" -type f -name "*.po"); do
+        msgmerge --update --backup=none "$PO_FILE" "$project_dir/packages/web/management/languages/messages.pot" 2>/dev/null >/dev/null
+        msgcat --sort-output -o "$PO_FILE" "$PO_FILE"
     done
 }
 
@@ -39,35 +32,35 @@ gitbranch=$(git branch --show-current)
 # Get the latest tag commit
 gitcom=$(git rev-list --tags --no-walk --max-count=1)
 
-# Count commits from the last tag to HEAD
+# Count commits from the last tag to HEAD (your original logic)
 gitcount=$(git rev-list master..HEAD --count)
 
 # Extract the first part of the branch name
-branchon=$(echo ${gitbranch} | awk -F'-' '{print $1}')
+branchon=$(echo "$gitbranch" | awk -F'-' '{print $1}')
 
 # Extract the second part of the branch name
-branchend=$(echo ${gitbranch} | awk -F'-' '{print $2}')
+branchend=$(echo "$gitbranch" | awk -F'-' '{print $2}')
 
 # Define the path to the system file
 system_file="$project_dir/packages/web/lib/fog/system.class.php"
 
-current_version=$(grep "define('FOG_VERSION'" $system_file | sed "s/.*FOG_VERSION', '\([^']*\)');/\1/")
+current_version=$(grep "define('FOG_VERSION'" "$system_file" | sed "s/.*FOG_VERSION', '\([^']*\)');/\1/")
 
 verbegin=""
 channel=""
 
-case $branchon in
+case "$branchon" in
     dev)
         # Describe the tag and append the commit count correctly
-        tagversion=$(git describe --tags ${gitcom})
+        tagversion=$(git describe --tags "$gitcom")
         baseversion=${tagversion%.*}   # Retain everything before the last segment
         lastrevision=${tagversion##*.} # Extracts the last segment
         trunkversion="${baseversion}.${gitcount}"
         channel="Patches"
         ;;
     stable)
         # Describe the tag and append the commit count correctly
-        tagversion=$(git describe --tags ${gitcom})
+        tagversion=$(git describe --tags "$gitcom")
         baseversion=${tagversion%.*}   # Retain everything before the last segment
         lastrevision=${tagversion##*.} # Extracts the last segment
         trunkversion="${baseversion}.${gitcount}"
@@ -83,9 +76,12 @@ case $branchon in
     rc)
         channel="Release Candidate"
         version_prefix="${branchend}.0-RC"
-        if [[ $current_version =~ ${version_prefix}-([0-9]+) ]]; then
-            last_rc_version=${BASH_REMATCH[1]}
+        # POSIX replacement for: if [[ $current_version =~ ${version_prefix}-([0-9]+) ]]
+        n=$(printf '%s\n' "$current_version" | sed -n "s/^${version_prefix}-\([0-9][0-9]*\)\$/\1/p")
+        if [ -n "$n" ]; then
+            last_rc_version=$n
             next_rc_version=$((last_rc_version + 1))
+            trunkversion="${version_prefix}-${next_rc_version}"
         else
             trunkversion="${version_prefix}-1"
         fi
@@ -97,10 +93,10 @@ case $branchon in
         ;;
 esac
 
-
 # Update the version and channel in the system file
-sed -i "s/define('FOG_VERSION',.*);/define('FOG_VERSION', '$trunkversion');/g" $system_file
-sed -i "s/define('FOG_CHANNEL',.*);/define('FOG_CHANNEL', '$channel');/g" $system_file
+sed -i "s/define('FOG_VERSION',.*);/define('FOG_VERSION', '$trunkversion');/g" "$system_file"
+sed -i "s/define('FOG_CHANNEL',.*);/define('FOG_CHANNEL', '$channel');/g" "$system_file"
 
 # Add the modified system file to the staging area
-git add $system_file
+git add "$system_file"
+

packages/web/lib/fog/system.class.php

@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '1.5.10.1712');
+        define('FOG_VERSION', '1.5.10.1713');
         define('FOG_SCHEMA', 273);
         define('FOG_BCACHE_VER', 141);
         define('FOG_CLIENT_VERSION', '0.13.0');