Commit c836bc5

committed

util/build.sh: abort when the ngx_http_redis module patch is not in place. thanks Ilya Shipitsin for the report in openresty#49.

1 parent 962b08e commit c836bc5Copy full SHA for c836bc5

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`		`-# this file is mostly meant to be used by the author himself.`
	`3`	`+# this file is only meant to be used by the module developers.`
`4`	`4`
`5`	`5`	root=`pwd`
`6`	`6`	`version=1ドル`
`@@ -11,7 +11,13 @@ ngx_redis_version=0.3.7`
`11`	`11`	`ngx_redis_path=$home/work/nginx/ngx_http_redis-$ngx_redis_version`
`12`	`12`
`13`	`13`	`cd $ngx_redis_path \|\| exit 1`
`14`		`-patch --forward -p1 < $root/../ngx_openresty/patches/ngx_http_redis-$ngx_redis_version-variables_in_redis_pass.patch`
	`14`	`+patch_file=$root/../openresty/patches/ngx_http_redis-$ngx_redis_version-variables_in_redis_pass.patch`
	`15`	`+if [ ! -f $patch_file ]; then`
	`16`	`+ echo "$patch_file: No such file" > /dev/stderr`
	`17`	`+ exit 1`
	`18`	`+fi`
	`19`	`+# we ignore any errors here since the target directory might have already been patched.`
	`20`	`+patch --forward -p1 < $patch_file`
`15`	`21`	`cd $root \|\| exit 1`
`16`	`22`
`17`	`23`	`#--without-http_memcached_module \`

Comments

(0)