Merge pull request #17 from kasakrisz/master-support-digitx-v2

support multiple digits before 'x' in release line branch names
kgyrtkirk · May 16, 2023 · f7a2de0 · f7a2de0
2 parents 3d515e9 + d6d471d
commit f7a2de0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/scripts/cdpd-patcher b/src/main/scripts/cdpd-patcher
@@ -26,8 +26,11 @@ case "$VERSION" in
   *)
 esac
 
+# Need to add extglob to enable using pattern matching like *(pattern-list)
+# *([[:digit:]]) - matches 0 or more occurrences of any digit
+shopt -s extglob
 case "$VERSION" in
-  cdw-master|CDWH-*|cdpd-master|*-maint|*.x|CDH-7.1.7.*|CDH-7.1.8.*)
+  cdw-master|CDWH-*|cdpd-master|*-maint|*.*([[:digit:]])x|CDH-7.1.7.*|CDH-7.1.8.*)
     if [[ "$VERSION" = "cdw-master" || "$VERSION" = "CDWH-"* ]]; then
       echo "@@@ changing stack to CDWH"
       STACK=CDWH