diff --git a/init.d/v2ray b/init.d/v2ray index 911fe8a..e44ccca 100644 --- a/init.d/v2ray +++ b/init.d/v2ray @@ -2,10 +2,10 @@ name="V2Ray" description="A platform for building proxies to bypass network restrictions" -description_checkconfig="Verify configuration file" +description_checkconfig="Test configuration file" -: ${confdir:="/usr/local/etc/v2ray/"} : ${env:="V2RAY_LOCATION_ASSET=/usr/local/lib/v2ray/"} +: ${confdir:="/usr/local/etc/v2ray/"} command="/usr/local/bin/v2ray" command_args="-confdir $confdir" @@ -21,7 +21,7 @@ depend() { } checkconfig() { - if [ ! -d "$confdir" ] ; then + if [ ! -d "$confdir" ]; then eerror "You need to setup $confdir first" return 1 fi diff --git a/install-release.sh b/install-release.sh index 11b8146..da3b869 100644 --- a/install-release.sh +++ b/install-release.sh @@ -14,7 +14,7 @@ case "$(arch -s)" in ;; esac -if [[ "$(command -v apk)" ]]; then +if [ "$(command -v apk)" ]; then apk update apk add curl unzip else @@ -27,20 +27,16 @@ ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$BIT.zip" DOWNLOAD_LINK="https://github.com/v2ray/v2ray-core/releases/latest/download/v2ray-linux-$BIT.zip" curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE" "$DOWNLOAD_LINK" -# -if [[ "$?" -ne '0' ]]; then +if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE.dgst" "$DOWNLOAD_LINK.dgst" -# -if [[ "$?" -ne '0' ]]; then +if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi -if [[ "$(cat $ZIP_FILE.dgst)" == 'Not Found' ]]; then - echo 'error: This version does not support verification. Please replace with another version.' - exit 1 -fi # Verification of V2Ray archive for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" @@ -58,20 +54,18 @@ install -m 755 "${TMP_DIRECTORY}v2ctl" "/usr/local/bin/v2ctl" install -d /usr/local/lib/v2ray/ install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/v2ray/geoip.dat" install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/v2ray/geosite.dat" -if [[ ! -d '/usr/local/etc/v2ray/' ]]; then +if [ ! -d '/usr/local/etc/v2ray/' ]; then install -d /usr/local/etc/v2ray/ for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do echo '{}' > "/usr/local/etc/v2ray/$BASE.json" done + CONFDIR=yes fi -if [[ ! -d '/var/log/v2ray/' ]]; then - if [[ -n "$(id nobody | grep nogroup)" ]]; then - install -d -o nobody -g nogroup /var/log/v2ray/ - else - install -d -o nobody -g nobody /var/log/v2ray/ - fi +if [ ! -d '/var/log/v2ray/' ]; then + install -d -o nobody -g nobody /var/log/v2ray/ + LOG=yes fi -if [[ ! -f '/etc/systemd/system/v2ray.service' ]]; then +if [ ! -f '/etc/init.d/v2ray' ]; then mkdir "${TMP_DIRECTORY}init.d/" curl -o "${TMP_DIRECTORY}init.d/v2ray" https://raw.githubusercontent.workers.dev/v2fly/alpinelinux-install-v2ray/master/init.d/v2ray -s if [[ "$?" -ne '0' ]]; then @@ -79,6 +73,7 @@ if [[ ! -f '/etc/systemd/system/v2ray.service' ]]; then exit 1 fi install -m 755 "${TMP_DIRECTORY}init.d/v2ray" /etc/init.d/v2ray + OPENRC=yes fi rm -r "$TMP_DIRECTORY" @@ -87,15 +82,21 @@ echo 'installed: /usr/local/bin/v2ray' echo 'installed: /usr/local/bin/v2ctl' echo 'installed: /usr/local/lib/v2ray/geoip.dat' echo 'installed: /usr/local/lib/v2ray/geosite.dat' -echo 'installed: /usr/local/etc/v2ray/00_log.json' -echo 'installed: /usr/local/etc/v2ray/01_api.json' -echo 'installed: /usr/local/etc/v2ray/02_dns.json' -echo 'installed: /usr/local/etc/v2ray/03_routing.json' -echo 'installed: /usr/local/etc/v2ray/04_policy.json' -echo 'installed: /usr/local/etc/v2ray/05_inbounds.json' -echo 'installed: /usr/local/etc/v2ray/06_outbounds.json' -echo 'installed: /usr/local/etc/v2ray/07_transport.json' -echo 'installed: /usr/local/etc/v2ray/08_stats.json' -echo 'installed: /usr/local/etc/v2ray/09_reverse.json' -echo 'installed: /var/log/v2ray/' -echo 'installed: /etc/init.d/v2ray' +if [ -n "$CONFDIR" ]; then + echo 'installed: /usr/local/etc/v2ray/00_log.json' + echo 'installed: /usr/local/etc/v2ray/01_api.json' + echo 'installed: /usr/local/etc/v2ray/02_dns.json' + echo 'installed: /usr/local/etc/v2ray/03_routing.json' + echo 'installed: /usr/local/etc/v2ray/04_policy.json' + echo 'installed: /usr/local/etc/v2ray/05_inbounds.json' + echo 'installed: /usr/local/etc/v2ray/06_outbounds.json' + echo 'installed: /usr/local/etc/v2ray/07_transport.json' + echo 'installed: /usr/local/etc/v2ray/08_stats.json' + echo 'installed: /usr/local/etc/v2ray/09_reverse.json' +fi +if [ -n "$LOG" ]; then + echo 'installed: /var/log/v2ray/' +fi +if [ -n "$OPENRC" ]; then + echo 'installed: /etc/init.d/v2ray' +fi