[maven-wrapper] branch master updated: [MWRAPPER-58] add -L to curl command

[hboutemy]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git


The following commit(s) were added to refs/heads/master by this push:
     new 313654d  [MWRAPPER-58] add -L to curl command
313654d is described below

commit 313654df5a8cd06f12ce619eff9ff26d8d019497
Author: James Z.M. Gao <gaozhim...@360.cn>
AuthorDate: Sun Mar 13 23:23:15 2022 +0800

    [MWRAPPER-58] add -L to curl command
---
 maven-wrapper-distribution/src/resources/mvnw | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/maven-wrapper-distribution/src/resources/mvnw 
b/maven-wrapper-distribution/src/resources/mvnw
index a2dba57..711830e 100755
--- a/maven-wrapper-distribution/src/resources/mvnw
+++ b/maven-wrapper-distribution/src/resources/mvnw
@@ -244,10 +244,11 @@ else
           QUIET=""
         fi
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f 
"$wrapperJarPath"
+            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath"
         else
-            wget $QUIET --http-user=$MVNW_USERNAME 
--http-password=$MVNW_PASSWORD "$wrapperUrl" -O "$wrapperJarPath" || rm -f 
"$wrapperJarPath"
+            wget $QUIET --http-user="$MVNW_USERNAME" 
--http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath"
         fi
+        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
     elif command -v curl > /dev/null; then
         QUIET="--silent"
         if [ "$MVNW_VERBOSE" = true ]; then
@@ -255,11 +256,11 @@ else
           QUIET=""
         fi
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f
+            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L
         else
-            curl $QUIET --user $MVNW_USERNAME:$MVNW_PASSWORD -o 
"$wrapperJarPath" "$wrapperUrl" -f
+            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o 
"$wrapperJarPath" "$wrapperUrl" -f -L
         fi
-
+        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
     else
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Falling back to using Java to download"