From 4b31bcfa3ccd9890049d92812c314e5cdd2bea21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A0=BD=E5=9F=B9=E8=80=85?= Date: Mon, 14 Sep 2020 18:59:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(shell):=20=E5=AE=89=E8=A3=85=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=A2=9E=E5=8A=A0=E7=BE=A4=E6=99=96=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- release/install-tr-control-cn.sh | 7 ++++++- release/install-tr-control.sh | 11 ++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/release/install-tr-control-cn.sh b/release/install-tr-control-cn.sh index 5907418..f5b45e9 100644 --- a/release/install-tr-control-cn.sh +++ b/release/install-tr-control-cn.sh @@ -3,7 +3,7 @@ ARG1="$1" ROOT_FOLDER="" SCRIPT_NAME="$0" -SCRIPT_VERSION="1.2.2-beta2" +SCRIPT_VERSION="1.2.3" VERSION="" WEB_FOLDER="" ORG_INDEX_FILE="index.original.html" @@ -408,6 +408,11 @@ getTransmissionPath() { ROOT_FOLDER="/usr/local/share/transmission" fi + # 群晖 + if [ -f "/etc/synoinfo.conf" ]; then + ROOT_FOLDER="/var/packages/transmission/target/share/transmission" + fi + if [ ! -d "$ROOT_FOLDER" ]; then showLog "$MSG_FIND_WEB_FOLDER_FROM_PROCESS" "n" infos=`ps -Aww -o command= | sed -r -e '/[t]ransmission-da/!d' -e 's/ .+//'` diff --git a/release/install-tr-control.sh b/release/install-tr-control.sh index 138efa7..38b1686 100644 --- a/release/install-tr-control.sh +++ b/release/install-tr-control.sh @@ -3,7 +3,7 @@ ARG1="$1" ROOT_FOLDER="" SCRIPT_NAME="$0" -SCRIPT_VERSION="1.2.2-beta2" +SCRIPT_VERSION="1.2.3" VERSION="" WEB_FOLDER="" ORG_INDEX_FILE="index.original.html" @@ -404,6 +404,15 @@ getTransmissionPath() { ROOT_FOLDER="/usr/share/transmission" fi + if [ -f "/bin/freebsd-version" ]; then + ROOT_FOLDER="/usr/local/share/transmission" + fi + + # 群晖 + if [ -f "/etc/synoinfo.conf" ]; then + ROOT_FOLDER="/var/packages/transmission/target/share/transmission" + fi + if [ ! -d "$ROOT_FOLDER" ]; then showLog "$MSG_FIND_WEB_FOLDER_FROM_PROCESS" "n" infos=`ps -Aww -o command= | sed -r -e '/[t]ransmission-da/!d' -e 's/ .+//'`