Skip to content

Commit a18f02c

Browse files
author
Jun Nemoto
committedJul 5, 2017
[FAB-5179] Fix proxy auth for javaenv build
Proxy authentication for javaenv build does not work due to the wrong name of the parameter. This patch fixes it. Change-Id: Ie75a46333f7565c5b7ee61951fe3149f4898f42c Signed-off-by: Jun Nemoto <jun.nemoto.ff@hitachi.com>
1 parent 6c3cb99 commit a18f02c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎core/chaincode/shim/java/javabuild.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ pattern='(https?://)?((([^:\/]+)(:([^\/]*))?@)?([^:\/?]+)(:([0-9]+))?)'
3030
if [ -n "$HTTPPROXY" ]; then
3131
if [[ "$HTTPPROXY" =~ $pattern ]]; then
3232
[ -n "${BASH_REMATCH[4]}" ] && JAVA_OPTS="$JAVA_OPTS -Dhttp.proxyUser=${BASH_REMATCH[4]}"
33-
[ -n "${BASH_REMATCH[6]}" ] && JAVA_OPTS="$JAVA_OPTS -Dhttp.proxyPass=${BASH_REMATCH[6]}"
33+
[ -n "${BASH_REMATCH[6]}" ] && JAVA_OPTS="$JAVA_OPTS -Dhttp.proxyPassword=${BASH_REMATCH[6]}"
3434
[ -n "${BASH_REMATCH[7]}" ] && JAVA_OPTS="$JAVA_OPTS -Dhttp.proxyHost=${BASH_REMATCH[7]}"
3535
[ -n "${BASH_REMATCH[9]}" ] && JAVA_OPTS="$JAVA_OPTS -Dhttp.proxyPort=${BASH_REMATCH[9]}"
3636
fi
3737
fi
3838
if [ -n "$HTTPSPROXY" ]; then
3939
if [[ "$HTTPSPROXY" =~ $pattern ]]; then
4040
[ -n "${BASH_REMATCH[4]}" ] && JAVA_OPTS="$JAVA_OPTS -Dhttps.proxyUser=${BASH_REMATCH[4]}"
41-
[ -n "${BASH_REMATCH[6]}" ] && JAVA_OPTS="$JAVA_OPTS -Dhttps.proxyPass=${BASH_REMATCH[6]}"
41+
[ -n "${BASH_REMATCH[6]}" ] && JAVA_OPTS="$JAVA_OPTS -Dhttps.proxyPassword=${BASH_REMATCH[6]}"
4242
[ -n "${BASH_REMATCH[7]}" ] && JAVA_OPTS="$JAVA_OPTS -Dhttps.proxyHost=${BASH_REMATCH[7]}"
4343
[ -n "${BASH_REMATCH[9]}" ] && JAVA_OPTS="$JAVA_OPTS -Dhttps.proxyPort=${BASH_REMATCH[9]}"
4444
fi

0 commit comments

Comments
 (0)
Please sign in to comment.