From 72cfac821f5dade3f99a72f0f50522188cd8ccca Mon Sep 17 00:00:00 2001 From: shanhy Date: Mon, 22 Nov 2021 11:24:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20bug:=20=E5=AF=B9=E4=BA=8E=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E5=AE=89=E8=A3=85=E7=9B=AE=E5=BD=95=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E8=84=9A=E6=9C=AC=E6=9C=AA=E5=81=9A?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- release/install-tr-control-cn.sh | 8 +++++--- release/install-tr-control-gitee.sh | 9 ++++++--- release/install-tr-control.sh | 11 +++++++---- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/release/install-tr-control-cn.sh b/release/install-tr-control-cn.sh index 966f1ab..dff5576 100644 --- a/release/install-tr-control-cn.sh +++ b/release/install-tr-control-cn.sh @@ -95,9 +95,11 @@ initValues() { mkdir -p "$TMP_FOLDER" fi - # 获取 Transmission 目录 - getTransmissionPath - + # 判断是否指定了ROOT_FOLDER + if [ "$ROOT_FOLDER" == "" ]; then + # 获取 Transmission 目录 + getTransmissionPath + fi # 判断 ROOT_FOLDER 是否为一个有效的目录,如果是则表明传递了一个有效路径 if [ -d "$ROOT_FOLDER" ]; then showLog "$MSG_TR_WORK_FOLDER $ROOT_FOLDER/web" diff --git a/release/install-tr-control-gitee.sh b/release/install-tr-control-gitee.sh index b744529..8cce563 100644 --- a/release/install-tr-control-gitee.sh +++ b/release/install-tr-control-gitee.sh @@ -94,9 +94,12 @@ initValues() { if [ ! -d "$TMP_FOLDER" ]; then mkdir -p "$TMP_FOLDER" fi - - # 获取 Transmission 目录 - getTransmissionPath + + # 判断是否指定了ROOT_FOLDER + if [ "$ROOT_FOLDER" == "" ]; then + # 获取 Transmission 目录 + getTransmissionPath + fi # 判断 ROOT_FOLDER 是否为一个有效的目录,如果是则表明传递了一个有效路径 if [ -d "$ROOT_FOLDER" ]; then diff --git a/release/install-tr-control.sh b/release/install-tr-control.sh index 7ca2481..601ab5a 100644 --- a/release/install-tr-control.sh +++ b/release/install-tr-control.sh @@ -95,10 +95,13 @@ initValues() { if [ ! -d "$TMP_FOLDER" ]; then mkdir -p "$TMP_FOLDER" fi - - # 获取 Transmission 目录 - getTransmissionPath - + + # 判断是否指定了ROOT_FOLDER + if [ "$ROOT_FOLDER" == "" ]; then + # 获取 Transmission 目录 + getTransmissionPath + fi + # 判断 ROOT_FOLDER 是否为一个有效的目录,如果是则表明传递了一个有效路径 if [ -d "$ROOT_FOLDER" ]; then showLog "$MSG_TR_WORK_FOLDER $ROOT_FOLDER/web" From 5e9273b801de50536f4f1419145dd26e04091697 Mon Sep 17 00:00:00 2001 From: xzxiaoshan <365384722@qq.com> Date: Mon, 22 Nov 2021 13:58:18 +0800 Subject: [PATCH 2/2] Update install-tr-control-gitee.sh --- release/install-tr-control-gitee.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/release/install-tr-control-gitee.sh b/release/install-tr-control-gitee.sh index 8cce563..c70cce0 100644 --- a/release/install-tr-control-gitee.sh +++ b/release/install-tr-control-gitee.sh @@ -95,11 +95,11 @@ initValues() { mkdir -p "$TMP_FOLDER" fi - # 判断是否指定了ROOT_FOLDER - if [ "$ROOT_FOLDER" == "" ]; then - # 获取 Transmission 目录 - getTransmissionPath - fi + # 判断是否指定了ROOT_FOLDER + if [ "$ROOT_FOLDER" == "" ]; then + # 获取 Transmission 目录 + getTransmissionPath + fi # 判断 ROOT_FOLDER 是否为一个有效的目录,如果是则表明传递了一个有效路径 if [ -d "$ROOT_FOLDER" ]; then