From 55fe32f505759f4f5cf3dab95ea18f47518bafd0 Mon Sep 17 00:00:00 2001
From: IceCodeNew <icecodenew+gitkraken@gmail.com>
Date: Sat, 5 Sep 2020 10:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=B7=AF=E5=BE=84=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E6=9C=AB=E5=B0=BE=E7=9A=84=E6=96=9C=E6=9D=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

我个人更倾向于这样的风格，一方面我认为路径变量就应该使用目录的名字，而既然目录名里不会有 `/`，那所以变量里也不应该带。
另一方面我是真的担心会出现转义导致的问题，一个目录不可能以 `/` 结尾，但可以以 `\` 结尾。变量名里保证不去多此一举加上 `/` 的话，对于 `ugly\` 这样的目录名，我们就可以在之后用到这个变量的时候再来处理转义问题，而不需要对着变量值 `ugly\/` 头疼。
---
 install-release.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/install-release.sh b/install-release.sh
index 288383c..075eec3 100644
--- a/install-release.sh
+++ b/install-release.sh
@@ -340,9 +340,9 @@ decompression() {
 install_file() {
     NAME="$1"
     if [[ "$NAME" == 'v2ray' ]] || [[ "$NAME" == 'v2ctl' ]]; then
-        install -m 755 "${TMP_DIRECTORY}$NAME" "/usr/local/bin/$NAME"
+        install -m 755 "${TMP_DIRECTORY}/$NAME" "/usr/local/bin/$NAME"
     elif [[ "$NAME" == 'geoip.dat' ]] || [[ "$NAME" == 'geosite.dat' ]]; then
-        install -m 644 "${TMP_DIRECTORY}$NAME" "${DAT_PATH}$NAME"
+        install -m 644 "${TMP_DIRECTORY}/$NAME" "${DAT_PATH}$NAME"
     fi
 }
 
@@ -381,9 +381,9 @@ install_v2ray() {
 
 install_startup_service_file() {
     if [[ ! -f '/etc/systemd/system/v2ray.service' ]]; then
-        mkdir "${TMP_DIRECTORY}systemd/system/"
+        mkdir "${TMP_DIRECTORY}/systemd/system/"
         install_software curl
-        cat > "${TMP_DIRECTORY}systemd/system/v2ray.service" <<-EOF
+        cat > "${TMP_DIRECTORY}/systemd/system/v2ray.service" <<-EOF
 [Unit]
 Description=V2Ray Service
 After=network.target nss-lookup.target
@@ -400,7 +400,7 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-        cat > "${TMP_DIRECTORY}systemd/system/v2ray@.service" <<-EOF
+        cat > "${TMP_DIRECTORY}/systemd/system/v2ray@.service" <<-EOF
 [Unit]
 Description=V2Ray Service
 After=network.target nss-lookup.target
@@ -417,8 +417,8 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-        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
+        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
 }
@@ -525,8 +525,8 @@ main() {
     [[ "$REMOVE" -eq '1' ]] && remove_v2ray
 
     # Two very important variables
-    TMP_DIRECTORY="$(mktemp -du)/"
-    ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$MACHINE.zip"
+    TMP_DIRECTORY="$(mktemp -du)"
+    ZIP_FILE="${TMP_DIRECTORY}/v2ray-linux-$MACHINE.zip"
 
     # Install V2Ray from a local file, but still need to make sure the network is available
     if [[ "$LOCAL_INSTALL" -eq '1' ]]; then