github
/
fhs-install-v2ray
mirror of https://github.com/v2fly/fhs-install-v2ray
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5 from tzwjkl/master 

Remove unnecessary permission changes, add pre judgment for root uid.
pull/12/head
Dct Mei 2020-06-13 07:14:27 +00:00 committed by GitHub
parent 298835c945 1ec9723760
commit cbec4d92e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install-dat-release.sh
View File

@ -17,6 +17,14 @@ V2RAY="/usr/local/lib/v2ray/"
DOWNLOAD_LINK_GEOIP="https://github.com/v2ray/geoip/releases/latest/download/geoip.dat"
DOWNLOAD_LINK_GEOSITE="https://github.com/v2ray/domain-list-community/releases/latest/download/dlc.dat"
check_if_running_as_root() {
# If you want to run as another user, please modify $UID to be owned by this user
if [ $UID != "0" ]; then
echo "error: You must run this script as root!"
exit 1
fi
}
download_geoip() {
if ! curl -L -H 'Cache-Control: no-cache' -o "${V2RAY}geoip.dat.new" "$DOWNLOAD_LINK_GEOIP"; then
echo 'error: Download failed! Please check your network or try again.'
@ -53,13 +61,14 @@ download_geosite() {
rename_new() {
for DAT in 'geoip' 'geosite'; do
install -m 755 "${V2RAY}$DAT.dat.new" "${V2RAY}$DAT.dat"
install -m 644 "${V2RAY}$DAT.dat.new" "${V2RAY}$DAT.dat"
rm "${V2RAY}$DAT.dat.new"
rm "${V2RAY}$DAT.dat.sha256sum.new"
done
}
main() {
check_if_running_as_root
download_geoip
download_geosite
rename_new

15
install-release.sh
View File

@ -12,6 +12,14 @@
# If the script executes incorrectly, go to:
# https://github.com/v2fly/fhs-install-v2ray/issues
check_if_running_as_root() {
# If you want to run as another user, please modify $UID to be owned by this user
if [ $UID != "0" ]; then
echo "error: You must run this script as root!"
exit 1
fi
}
identify_the_operating_system_and_architecture() {
if [[ "$(uname)" == 'Linux' ]]; then
case "$(uname -m)" in
@ -318,7 +326,7 @@ install_file() {
if [[ "$NAME" == 'v2ray' ]] || [[ "$NAME" == 'v2ctl' ]]; then
install -m 755 "${TMP_DIRECTORY}$NAME" "/usr/local/bin/$NAME"
elif [[ "$NAME" == 'geoip.dat' ]] || [[ "$NAME" == 'geosite.dat' ]]; then
install -m 755 "${TMP_DIRECTORY}$NAME" "/usr/local/lib/v2ray/$NAME"
install -m 644 "${TMP_DIRECTORY}$NAME" "/usr/local/lib/v2ray/$NAME"
fi
}
@ -362,8 +370,8 @@ install_startup_service_file() {
echo 'error: Failed to start service file download! Please check your network or try again.'
exit 1
fi
install -m 755 "${TMP_DIRECTORY}systemd/system/v2ray.service" /etc/systemd/system/v2ray.service
install -m 755 "${TMP_DIRECTORY}systemd/system/v2ray@.service" /etc/systemd/system/v2ray@.service
install -m 644 "${TMP_DIRECTORY}systemd/system/v2ray.service" /etc/systemd/system/v2ray.service
install -m 644 "${TMP_DIRECTORY}systemd/system/v2ray@.service" /etc/systemd/system/v2ray@.service
SYSTEMD='1'
fi
}
@ -453,6 +461,7 @@ show_help() {
}
main() {
check_if_running_as_root
identify_the_operating_system_and_architecture
judgment_parameters "$@"