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

Fix SC2162; shfmt -i 2 -ci -sr 

Signed-off-by: IceCodeNew <32576256+IceCodeNew@users.noreply.github.com>
pull/152/head
IceCodeNew 2020-09-30 19:07:47 +08:00
parent 69aaf1981f
commit 5b92713370
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install-release.sh
View File

@ -366,7 +366,7 @@ install_startup_service_file() {
mkdir -p '/etc/systemd/system/v2ray@.service.d/' mkdir -p '/etc/systemd/system/v2ray@.service.d/'
if [[ -n "$JSONS_PATH" ]]; then if [[ -n "$JSONS_PATH" ]]; then
"rm" '/etc/systemd/system/v2ray.service.d/10-donot_touch_single_conf.conf' \ "rm" '/etc/systemd/system/v2ray.service.d/10-donot_touch_single_conf.conf' \
'/etc/systemd/system/v2ray@.service.d/10-donot_touch_single_conf.conf'; '/etc/systemd/system/v2ray@.service.d/10-donot_touch_single_conf.conf'
echo "# In case you have a good reason to do so, duplicate this file in the same directory and make your customizes there. echo "# In case you have a good reason to do so, duplicate this file in the same directory and make your customizes there.
# Or all changes you made will be lost! # Refer: https://www.freedesktop.org/software/systemd/man/systemd.unit.html # Or all changes you made will be lost! # Refer: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
[Service] [Service]
@ -376,7 +376,7 @@ ExecStart=/usr/local/bin/v2ray -confdir $JSONS_PATH" |
'/etc/systemd/system/v2ray@.service.d/10-donot_touch_multi_conf.conf' '/etc/systemd/system/v2ray@.service.d/10-donot_touch_multi_conf.conf'
else else
"rm" '/etc/systemd/system/v2ray.service.d/10-donot_touch_multi_conf.conf' \ "rm" '/etc/systemd/system/v2ray.service.d/10-donot_touch_multi_conf.conf' \
'/etc/systemd/system/v2ray@.service.d/10-donot_touch_multi_conf.conf'; '/etc/systemd/system/v2ray@.service.d/10-donot_touch_multi_conf.conf'
echo "# In case you have a good reason to do so, duplicate this file in the same directory and make your customizes there. echo "# In case you have a good reason to do so, duplicate this file in the same directory and make your customizes there.
# Or all changes you made will be lost! # Refer: https://www.freedesktop.org/software/systemd/man/systemd.unit.html # Or all changes you made will be lost! # Refer: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
[Service] [Service]
@ -520,7 +520,7 @@ main() {
if [[ "$LOCAL_INSTALL" -eq '1' ]]; then if [[ "$LOCAL_INSTALL" -eq '1' ]]; then
echo 'warn: Install V2Ray from a local file, but still need to make sure the network is available.' echo 'warn: Install V2Ray from a local file, but still need to make sure the network is available.'
echo -n 'warn: Please make sure the file is valid because we cannot confirm it. (Press any key) ...' echo -n 'warn: Please make sure the file is valid because we cannot confirm it. (Press any key) ...'
read read -r
install_software "$package_provide_bsdtar" 'bsdtar' install_software "$package_provide_bsdtar" 'bsdtar'
decompression "$LOCAL_FILE" decompression "$LOCAL_FILE"
else else