|
9 | 9 | # Obtains pkg-oss tool, creates packaging files and copies in module source. |
10 | 10 | # |
11 | 11 | # CHANGELOG |
| 12 | +# v0.20 [05-May-2026] Accept new versioning for NGINX Plus releases |
12 | 13 | # v0.19 [03-Sep-2024] Moved to GitHub |
13 | 14 | # v0.18 [29-Apr-2021] Added -V option to specify module version |
14 | 15 | # v0.17 [11-Nov-2020] Fixed bashisms and made /bin/sh default interpreter |
@@ -63,7 +64,7 @@ if [ $# -eq 0 ]; then |
63 | 64 | echo " -s | --skip-depends # Skip dependecies check/install" |
64 | 65 | echo " -y | --non-interactive # Automatically install dependencies and overwrite files" |
65 | 66 | echo " -f | --force-dynamic # Attempt to convert static configuration to dynamic module" |
66 | | - echo " -r <NGINX Plus release number> # Build against the corresponding OSS version for this release" |
| 67 | + echo " -r <NGINX Plus release number> # Build against the corresponding OSS version for this release (NN[pN] or NN.N[.N])" |
67 | 68 | echo " -v [NGINX OSS version number] # Build against this OSS version [current mainline] (default)" |
68 | 69 | echo " -o <package output directory> # Create package(s) in this directory (default: $OUTPUT_DIR)" |
69 | 70 | echo "" |
@@ -109,14 +110,15 @@ while [ $# -gt 1 ]; do |
109 | 110 | ;; |
110 | 111 | "-r") |
111 | 112 | BUILD_PLATFORM=Plus |
112 | | - if [ `echo -n $2 | tr -d '[0-9p]' | wc -c` -gt 0 ]; then |
113 | | - echo "$ME: ERROR: NGINX Plus release must be in the format NN[pN] - quitting" |
| 113 | + if [ `echo -n $2 | tr -d '[0-9p.]' | wc -c` -gt 0 ]; then |
| 114 | + echo "$ME: ERROR: NGINX Plus release must be in the format NN[pN] or NN.N[.N] - quitting" |
114 | 115 | exit 1 |
115 | 116 | elif [ "`echo "10^$2" | tr '^' '\n' | sort -nr | head -1`" = "10" ]; then |
116 | 117 | echo "$ME: ERROR: NGINX Plus release must be at least 11 to support dynamic modules - quitting" |
117 | 118 | exit 1 |
118 | 119 | fi |
119 | | - PLUS_REL=$2 |
| 120 | + # Normalize NN.N.N to NN.N for git branch naming |
| 121 | + PLUS_REL=`echo $2 | sed 's/^\([0-9]*\.[0-9]*\)\.[0-9]*$/\1/'` |
120 | 122 | shift; shift |
121 | 123 | ;; |
122 | 124 | "-v") |
|
0 commit comments