Browse Source

Refine scripts (#279)

Loyalsoldier 5 years ago
parent
commit
f0403a67a1

+ 1 - 1
release/bleedingrelease.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
 RELBODY="https://github.com/v2fly/v2ray-core/commit/${RELEASE_SHA}"
 RELBODY="https://github.com/v2fly/v2ray-core/commit/${RELEASE_SHA}"
 JSON_DATA=$(echo "{}" | jq -c ".tag_name=\"${RELEASE_TAG}\"")
 JSON_DATA=$(echo "{}" | jq -c ".tag_name=\"${RELEASE_TAG}\"")

+ 1 - 1
release/install-release.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
 # This file is accessible as https://install.direct/go.sh
 # This file is accessible as https://install.direct/go.sh
 # Original source is located at github.com/v2fly/v2ray-core/release/install-release.sh
 # Original source is located at github.com/v2fly/v2ray-core/release/install-release.sh

+ 3 - 3
release/mutilate/removeVSign.sh

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
-export VROOT=$( dirname "${BASH_SOURCE[0]}" )/../../
+export VROOT=$(dirname "${BASH_SOURCE[0]}")/../../
 
 
 rm $VROOT/infra/control/verify.go
 rm $VROOT/infra/control/verify.go
 
 
-sed -i '/VSign/d' $VROOT/go.mod
+sed -i '/VSign/d' $VROOT/go.mod

+ 2 - 2
release/requestsign.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
 RELEASE_DATA=$(curl --data "version=${SIGN_VERSION}" --data "password=${SIGN_SERVICE_PASSWORD}" -X POST "${SIGN_SERIVCE_URL}" )
 RELEASE_DATA=$(curl --data "version=${SIGN_VERSION}" --data "password=${SIGN_SERVICE_PASSWORD}" -X POST "${SIGN_SERIVCE_URL}" )
 echo $RELEASE_DATA
 echo $RELEASE_DATA
@@ -25,4 +25,4 @@ function upload() {
 }
 }
 
 
 curl "https://raw.githubusercontent.com/v2fly/Release/master/v2fly/${SIGN_VERSION}.Release" > Release
 curl "https://raw.githubusercontent.com/v2fly/Release/master/v2fly/${SIGN_VERSION}.Release" > Release
-upload Release
+upload Release

+ 2 - 2
release/requestsign_github.sh

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
 export SIGN_VERSION=$(cat $GITHUB_EVENT_PATH| jq -r ".release.tag_name")
 export SIGN_VERSION=$(cat $GITHUB_EVENT_PATH| jq -r ".release.tag_name")
 
 
 echo $SIGN_VERSION
 echo $SIGN_VERSION
 
 
-$GITHUB_WORKSPACE/release/requestsign.sh
+$GITHUB_WORKSPACE/release/requestsign.sh

+ 1 - 1
release/tagrelease.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
 CONST_refs="refs"
 CONST_refs="refs"
 
 

+ 1 - 1
release/user-package.sh

@@ -33,7 +33,7 @@ build_v2() {
 		local VERSIONTAG=$(git describe --abbrev=0 --tags)
 		local VERSIONTAG=$(git describe --abbrev=0 --tags)
 	fi
 	fi
 
 
-	LDFLAGS="-s -w -buildid= -X v2ray.com/core.codename=${CODENAME} -X v2ray.com/core.build=${BUILDNAME} -X v2ray.com/core.version=${VERSIONTAG}"
+	LDFLAGS="-s -w -buildid= -X v2ray.codename=${CODENAME} -X v2ray.build=${BUILDNAME} -X v2ray.version=${VERSIONTAG}"
 
 
 	echo ">>> Compile v2ray ..."
 	echo ">>> Compile v2ray ..."
 	env CGO_ENABLED=0 go build -o "$TMP"/v2ray"${EXESUFFIX}" -ldflags "$LDFLAGS" ./main
 	env CGO_ENABLED=0 go build -o "$TMP"/v2ray"${EXESUFFIX}" -ldflags "$LDFLAGS" ./main