feat: 脚本增加TR版本判断,以适应2.9以后的版本。

This commit is contained in:
ronggang 2024-03-20 13:01:05 +08:00
parent 5aeb20c141
commit 9018e35d12

View File

@ -3,8 +3,9 @@
ARG1="$1" ARG1="$1"
ROOT_FOLDER="" ROOT_FOLDER=""
SCRIPT_NAME="$0" SCRIPT_NAME="$0"
SCRIPT_VERSION="1.2.3" SCRIPT_VERSION="1.2.4"
VERSION="" VERSION=""
HTML_FOLDER_NAME="web"
WEB_FOLDER="" WEB_FOLDER=""
ORG_INDEX_FILE="index.original.html" ORG_INDEX_FILE="index.original.html"
INDEX_FILE="index.html" INDEX_FILE="index.html"
@ -102,9 +103,9 @@ initValues() {
fi fi
# 判断 ROOT_FOLDER 是否为一个有效的目录,如果是则表明传递了一个有效路径 # 判断 ROOT_FOLDER 是否为一个有效的目录,如果是则表明传递了一个有效路径
if [ -d "$ROOT_FOLDER" ]; then if [ -d "$ROOT_FOLDER" ]; then
showLog "$MSG_TR_WORK_FOLDER $ROOT_FOLDER/web" showLog "$MSG_TR_WORK_FOLDER $ROOT_FOLDER/$HTML_FOLDER_NAME"
INSTALL_TYPE=3 INSTALL_TYPE=3
WEB_FOLDER="$ROOT_FOLDER/web" WEB_FOLDER="$ROOT_FOLDER/$HTML_FOLDER_NAME"
SKIP_SEARCH=1 SKIP_SEARCH=1
fi fi
@ -156,16 +157,16 @@ findWebFolder() {
fi fi
INSTALL_TYPE=2 INSTALL_TYPE=2
else else
if [ -d "$ROOT_FOLDER" -a -d "$ROOT_FOLDER/web" ]; then if [ -d "$ROOT_FOLDER" -a -d "$ROOT_FOLDER/$HTML_FOLDER_NAME" ]; then
WEB_FOLDER="$ROOT_FOLDER/web" WEB_FOLDER="$ROOT_FOLDER/$HTML_FOLDER_NAME"
INSTALL_TYPE=1 INSTALL_TYPE=1
showLog "$ROOT_FOLDER/web $MSG_AVAILABLE." showLog "$ROOT_FOLDER/$HTML_FOLDER_NAME $MSG_AVAILABLE."
else else
showLog "$MSG_THE_SPECIFIED_DIRECTORY_DOES_NOT_EXIST" showLog "$MSG_THE_SPECIFIED_DIRECTORY_DOES_NOT_EXIST"
ROOT_FOLDER=`find / -name 'web' -type d 2>/dev/null| grep 'transmission/web' | sed 's/\/web$//g'` ROOT_FOLDER=`find / -name 'web' -type d 2>/dev/null| grep 'transmission/web' | sed 's/\/web$//g'`
if [ -d "$ROOT_FOLDER/web" ]; then if [ -d "$ROOT_FOLDER/$HTML_FOLDER_NAME" ]; then
WEB_FOLDER="$ROOT_FOLDER/web" WEB_FOLDER="$ROOT_FOLDER/$HTML_FOLDER_NAME"
INSTALL_TYPE=1 INSTALL_TYPE=1
fi fi
fi fi
@ -195,14 +196,14 @@ install() {
# 下载安装包 # 下载安装包
download download
# 创建web文件夹从 20171014 之后打包文件不包含web目录直接打包为src下所有文件 # 创建web文件夹从 20171014 之后打包文件不包含web目录直接打包为src下所有文件
mkdir web mkdir $HTML_FOLDER_NAME
# 解压缩包 # 解压缩包
unpack "web" unpack "$HTML_FOLDER_NAME"
showLog "$MSG_PACK_COPYING" showLog "$MSG_PACK_COPYING"
# 复制文件到 # 复制文件到
cp -r web "$ROOT_FOLDER" cp -r $HTML_FOLDER_NAME "$ROOT_FOLDER"
# 设置权限 # 设置权限
setPermissions "$ROOT_FOLDER" setPermissions "$ROOT_FOLDER"
# 安装完成 # 安装完成
@ -369,9 +370,9 @@ showMainMenu() {
6) 6)
echo -n "$MSG_INPUT_TR_FOLDER" echo -n "$MSG_INPUT_TR_FOLDER"
read input read input
if [ -d "$input/web" ]; then if [ -d "$input/$HTML_FOLDER_NAME" ]; then
ROOT_FOLDER="$input" ROOT_FOLDER="$input"
showLog "$MSG_SPECIFIED_FOLDER $input/web" showLog "$MSG_SPECIFIED_FOLDER $input/$HTML_FOLDER_NAME"
else else
showLog "$MSG_INVALID_PATH" showLog "$MSG_INVALID_PATH"
fi fi
@ -412,6 +413,20 @@ getTransmissionPath() {
# 群晖 # 群晖
if [ -f "/etc/synoinfo.conf" ]; then if [ -f "/etc/synoinfo.conf" ]; then
# 开始检测TR版本用于判断ui存放目录
TRANSMISSION_REMOTE="/var/packages/transmission/target/bin/transmission-remote"
if [[ -x "$TRANSMISSION_REMOTE" ]]; then
tr_version=$("$TRANSMISSION_REMOTE" -V 2>&1 | cut -d " " -f 2)
showLog "transmission version: $tr_version"
# 判断 TR 主版本号
if [ ${tr_version:0:1} = 2 ]; then
HTML_FOLDER_NAME="web"
else
HTML_FOLDER_NAME="public_html"
fi
fi
ROOT_FOLDER="/var/packages/transmission/target/share/transmission" ROOT_FOLDER="/var/packages/transmission/target/share/transmission"
fi fi