Skip to content

Commit 226835b

Browse files
committed
one followup fix for the previous commit.
1 parent 6abb404 commit 226835b

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

util/build.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,30 @@ home=~
88
force=$2
99

1010
ngx_redis_version=0.3.7
11+
cd $home/work/nginx/ || exit 1
1112
ngx_redis_path=$home/work/nginx/ngx_http_redis-$ngx_redis_version
13+
rm -rf $ngx_redis_path || exit 1
14+
tar -xzvf ngx_http_redis-$ngx_redis_version.tar.gz || exit 1
1215

1316
cd $ngx_redis_path || exit 1
17+
1418
patch_file=$root/../openresty/patches/ngx_http_redis-$ngx_redis_version-variables_in_redis_pass.patch
1519
if [ ! -f $patch_file ]; then
1620
echo "$patch_file: No such file" > /dev/stderr
1721
exit 1
1822
fi
1923
# we ignore any errors here since the target directory might have already been patched.
20-
patch --forward -p1 < $patch_file
24+
patch -p1 < $patch_file || exit 1
25+
26+
cd $ngx_redis_path || exit 1
2127

2228
patch_file=$root/../openresty/patches/ngx_http_redis-$ngx_redis_version-default_port_fix.patch
2329
if [ ! -f $patch_file ]; then
2430
echo "$patch_file: No such file" > /dev/stderr
2531
exit 1
2632
fi
2733
# we ignore any errors here since the target directory might have already been patched.
28-
patch --forward -p1 < $patch_file
34+
patch -p1 < $patch_file || exit 1
2935

3036
cd $root || exit 1
3137

0 commit comments

Comments
 (0)