From d1538f00dfc803fb482f71b3edc420279164ec1d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 30 Oct 2025 07:03:22 -0400
Subject: [PATCH] v0.8.4 - Updated increment_and_push.sh

---
 increment_and_push.sh | 52 ++++++++++++++++++++++++++-----------------
 src/main.h            |  4 ++--
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/increment_and_push.sh b/increment_and_push.sh
index 00bc83f..84ff5b8 100755
--- a/increment_and_push.sh
+++ b/increment_and_push.sh
@@ -21,31 +21,42 @@ VERSION_INCREMENT_TYPE="patch"  # "patch", "minor", or "major"
 show_usage() {
     echo "C-Relay Increment and Push Script"
     echo ""
+    echo "USAGE:"
+    echo "  $0 [OPTIONS] \"commit message\""
+    echo ""
     echo "COMMANDS:"
-    echo "  $0 \"commit message\"           - Default: increment patch, commit & push"
-    echo "  $0 --patch \"commit message\"   - Increment patch version"
-    echo "  $0 --minor \"commit message\"   - Increment minor version"
-    echo "  $0 --major \"commit message\"   - Increment major version"
-    echo "  $0 -r \"commit message\"        - Release: increment minor, create release with assets"
-    echo "  $0 -h                          - Show this help message"
+    echo "  $0 \"commit message\"           Default: increment patch, commit & push"
+    echo "  $0 -p \"commit message\"        Increment patch version"
+    echo "  $0 -m \"commit message\"        Increment minor version"
+    echo "  $0 -M \"commit message\"        Increment major version"
+    echo "  $0 -r \"commit message\"        Create release with assets (no version increment)"
+    echo "  $0 -r -m \"commit message\"     Create release with minor version increment"
+    echo "  $0 -h                          Show this help message"
+    echo ""
+    echo "OPTIONS:"
+    echo "  -p, --patch    Increment patch version (default)"
+    echo "  -m, --minor    Increment minor version"
+    echo "  -M, --major    Increment major version"
+    echo "  -r, --release  Create release with assets"
+    echo "  -h, --help     Show this help message"
     echo ""
     echo "EXAMPLES:"
     echo "  $0 \"Fixed event validation bug\""
-    echo "  $0 --patch \"Fixed event validation bug\""
-    echo "  $0 --minor \"Added new features\""
-    echo "  $0 --major \"Breaking API changes\""
-    echo "  $0 --release \"Major release with new features\""
+    echo "  $0 -m \"Added new features\""
+    echo "  $0 -M \"Breaking API changes\""
+    echo "  $0 -r \"Release current version\""
+    echo "  $0 -r -m \"Release with minor increment\""
     echo ""
     echo "VERSION INCREMENT MODES:"
-    echo "  --patch (default): Increment patch version (v1.2.3 → v1.2.4)"
-    echo "  --minor:           Increment minor version, zero patch (v1.2.3 → v1.3.0)"
-    echo "  --major:           Increment major version, zero minor+patch (v1.2.3 → v2.0.0)"
+    echo "  -p, --patch (default): Increment patch version (v1.2.3 → v1.2.4)"
+    echo "  -m, --minor:           Increment minor version, zero patch (v1.2.3 → v1.3.0)"
+    echo "  -M, --major:           Increment major version, zero minor+patch (v1.2.3 → v2.0.0)"
     echo ""
     echo "RELEASE MODE (-r flag):"
-    echo "  - Increment minor version, zero patch (v1.2.3 → v1.3.0)"
     echo "  - Build static binary using build_static.sh"
     echo "  - Create source tarball"
     echo "  - Git add, commit, push, and create Gitea release with assets"
+    echo "  - Can be combined with version increment flags"
     echo ""
     echo "REQUIREMENTS FOR RELEASE MODE:"
     echo "  - Gitea token in ~/.gitea_token for release uploads"
@@ -57,18 +68,17 @@ while [[ $# -gt 0 ]]; do
     case $1 in
         -r|--release)
             RELEASE_MODE=true
-            VERSION_INCREMENT_TYPE="minor"
             shift
             ;;
-        --patch)
+        -p|--patch)
             VERSION_INCREMENT_TYPE="patch"
             shift
             ;;
-        --minor)
+        -m|--minor)
             VERSION_INCREMENT_TYPE="minor"
             shift
             ;;
-        --major)
+        -M|--major)
             VERSION_INCREMENT_TYPE="major"
             shift
             ;;
@@ -452,8 +462,10 @@ main() {
     if [[ "$RELEASE_MODE" == true ]]; then
         print_status "=== RELEASE MODE ==="
 
-        # Increment version based on type (default to minor for releases)
-        increment_version "$VERSION_INCREMENT_TYPE"
+        # Only increment version if explicitly requested (not just because of -r flag)
+        if [[ "$VERSION_INCREMENT_TYPE" != "patch" ]]; then
+            increment_version "$VERSION_INCREMENT_TYPE"
+        fi
 
         # Create new git tag BEFORE compilation so version.h picks it up
         if git tag "$NEW_VERSION" > /dev/null 2>&1; then
diff --git a/src/main.h b/src/main.h
index 979e44f..353008d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -12,8 +12,8 @@
 // Version information (auto-updated by build system)
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 8
-#define VERSION_PATCH 3
-#define VERSION "v0.8.3"
+#define VERSION_PATCH 4
+#define VERSION "v0.8.4"
 
 // Relay metadata (authoritative source for NIP-11 information)
 #define RELAY_NAME "C-Relay"