Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge fly #2590

Merged
merged 17 commits into from
Jun 23, 2020
Merged

merge fly #2590

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
70283d7
Refine updatedat script (#24)
Loyalsoldier Jun 19, 2020
51be32f
actions add coverage
kslr Jun 19, 2020
0b612c4
Merge branch 'master' of github.com:v2fly/v2ray-core
kslr Jun 19, 2020
8dc133c
update test badge
kslr Jun 19, 2020
78729fc
improve test coverage
kslr Jun 20, 2020
3c5476a
update codecov badge
kslr Jun 20, 2020
e5f028b
Create Dependabot config file (#25)
dependabot-preview[bot] Jun 20, 2020
825e5b8
Bump github.com/golang/mock from 1.2.0 to 1.4.3 (#26)
dependabot-preview[bot] Jun 20, 2020
48c489a
only handle push
kslr Jun 20, 2020
e0f38a1
Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 (#27)
dependabot[bot] Jun 20, 2020
36ff6bb
Bump github.com/google/go-cmp from 0.4.0 to 0.5.0 (#29)
dependabot[bot] Jun 20, 2020
6b25623
update crypto package
kslr Jun 22, 2020
4a37179
update net,sync,sys package
kslr Jun 22, 2020
b4a071a
Bump github.com/miekg/dns from 1.1.4 to 1.1.29 (#28)
dependabot[bot] Jun 22, 2020
98a5d3f
Update install-release.sh (#16)
JH2628 Jun 22, 2020
477daeb
clean go.sum
kslr Jun 23, 2020
bf80143
v4.25.1
kslr Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update install-release.sh (#16) 
更改安装路径到 v2fly/v2ray-core
  • Loading branch information
@JH2628
JH2628 authored Jun 22, 2020
commit 98a5d3fc7b995c6acb1c675fccac0f1c990371fa
6 changes: 3 additions & 3 deletions release/install-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# This file is accessible as https://install.direct/go.sh
# Original source is located at github.com/v2ray/v2ray-core/release/install-release.sh
# Original source is located at github.com/v2fly/v2ray-core/release/install-release.sh

# If not specify, default meaning of return value:
# 0: Success
Expand Down Expand Up @@ -176,7 +176,7 @@ downloadV2Ray(){
if [[ "${DIST_SRC}" == "jsdelivr" ]]; then
DOWNLOAD_LINK="https://cdn.jsdelivr.net/gh/v2ray/dist/v2ray-linux-${VDIS}.zip"
else
DOWNLOAD_LINK="https://github.com/v2ray/v2ray-core/releases/download/${NEW_VER}/v2ray-linux-${VDIS}.zip"
DOWNLOAD_LINK="https://github.com/v2fly/v2ray-core/releases/download/${NEW_VER}/v2ray-linux-${VDIS}.zip"
fi
colorEcho ${BLUE} "Downloading V2Ray: ${DOWNLOAD_LINK}"
curl ${PROXY} -L -H "Cache-Control: no-cache" -o ${ZIPFILE} ${DOWNLOAD_LINK}
Expand Down Expand Up @@ -254,7 +254,7 @@ getVersion(){
VER="$(/usr/bin/v2ray/v2ray -version 2>/dev/null)"
RETVAL=$?
CUR_VER="$(normalizeVersion "$(echo "$VER" | head -n 1 | cut -d " " -f2)")"
TAG_URL="https://api.github.com/repos/v2ray/v2ray-core/releases/latest"
TAG_URL="https://api.github.com/repos/v2fly/v2ray-core/releases/latest"
NEW_VER="$(normalizeVersion "$(curl ${PROXY} -H "Accept: application/json" -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:74.0) Gecko/20100101 Firefox/74.0" -s "${TAG_URL}" --connect-timeout 10| grep 'tag_name' | cut -d\" -f4)")"

if [[ $? -ne 0 ]] || [[ $NEW_VER == "" ]]; then
Expand Down