Merge branch 'develop' into 'master'

修改上传脚本

See merge request SilverBlog/SilverBlog_Android!82

Author: qwe7002

upload-github-release-asset.sh

@@ -41,14 +41,14 @@ AUTH="Authorization: token $github_api_token"
 WGET_ARGS="--content-disposition --auth-no-challenge --no-cookie"
 CURL_ARGS="-LJO#"
 
-curl -H "Authorization: token $github_api_token" -x "${proxy}" -X POST -d '{"tag_name":"'"$tag"'","body":"'"$(git log -1 --pretty=%B --oneline)"'","target_commitish": "master"}' "$GH_REPO/releases"
+curl -H "Authorization: token $github_api_token" -X POST -d '{"tag_name":"'"$tag"'","body":"'"$(git log -1 --pretty=%B --oneline)"'","target_commitish": "master"}' "$GH_REPO/releases"
 
 if [[ "$tag" == 'LATEST' ]]; then
   GH_TAGS="$GH_REPO/releases/latest"
 fi
 
 # Validate token.
-curl -o /dev/null -x "${proxy}" -sH "$AUTH" $GH_REPO || { echo "Error: Invalid repo, token or network issue!";  exit 1; }
+curl -o /dev/null -sH "$AUTH" $GH_REPO || { echo "Error: Invalid repo, token or network issue!";  exit 1; }
 
 # Read asset tags.
 response=$(curl -sH "$AUTH" $GH_TAGS)
@@ -62,4 +62,4 @@ echo "Uploading asset... "
 
 # Construct url
 
-curl "$GITHUB_OAUTH_BASIC" -x "${proxy}" --data-binary @"$filename" -H "Authorization: token $github_api_token" -H "Content-Type: application/octet-stream" "https://uploads.github.com/repos/$owner/$repo/releases/$id/assets?name=$(basename $filename)"
+curl "$GITHUB_OAUTH_BASIC" --data-binary @"$filename" -H "Authorization: token $github_api_token" -H "Content-Type: application/octet-stream" "https://uploads.github.com/repos/$owner/$repo/releases/$id/assets?name=$(basename $filename)"