xm/MIXBOX-ARCHIVE
1
0
Fork 0
mirror of https://github.com/monlor/MIXBOX-ARCHIVE.git synced 2026-03-10 23:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复wget-ssl的bug，修复dms插件bug

Browse Source
This commit is contained in:
monlor
2020-03-05 13:17:17 +08:00
parent 1e0aeada56
commit 740f1037b7
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dms/config/dms.uci
View File

@@ -5,4 +5,4 @@ backupfiles=""
supports="linux_arm,linux_mips,linux_x86_64" supports="linux_arm,linux_mips,linux_x86_64"
appinfo="dms是一款DLNA数字媒体服务器" appinfo="dms是一款DLNA数字媒体服务器"
newinfo="" newinfo=""
version="0.0.1" version="0.0.2"

2
apps/dms/scripts/dms.sh
View File

@@ -13,7 +13,7 @@ start() {
[ -z "$path" ] && echo "媒体目录不能为空！" && exit 1 [ -z "$path" ] && echo "媒体目录不能为空！" && exit 1
# open_port # open_port
# write_firewall_start # write_firewall_start
daemon ${mbroot}/apps/${appname}/bin/${appname} -path "${path}" -friendlyName "${servername}" -http "11338" -fFprobeCachePath "${mbdisk}/.dms-ffprobe-cache" daemon ${mbroot}/apps/${appname}/bin/${appname} -path "${path}" -friendlyName "${servername}" -http ":11338" -fFprobeCachePath "${mbdisk}/.dms-ffprobe-cache"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
logsh "【$service】" "启动${appname}服务失败！" && end logsh "【$service】" "启动${appname}服务失败！" && end
else else

2
apps/mixbox/config/mixbox.uci
View File

@@ -4,4 +4,4 @@ needver=""
supports="linux_arm,linux_mips,linux_x86_64" supports="linux_arm,linux_mips,linux_x86_64"
appinfo="一款支持多平台，多架构的Shell工具箱" appinfo="一款支持多平台，多架构的Shell工具箱"
newinfo="新增base64_encode工具" newinfo="新增base64_encode工具"
version="0.1.7" version="0.1.8"

6
apps/mixbox/scripts/helper.sh
View File

@@ -10,12 +10,13 @@ wgetsh() {
[ ! -d ${mbtmp} ] && mkdir -p ${mbtmp} [ ! -d ${mbtmp} ] && mkdir -p ${mbtmp}
rm -rf ${mbtmp}/${wgetfilename} rm -rf ${mbtmp}/${wgetfilename}
if command -v wget-ssl &> /dev/null; then if command -v wget-ssl &> /dev/null; then
result1=$(wget-ssl --no-check-certificate --tries=1 --timeout=10 --spider -nv -O "${mbtmp}/${wgetfilename}" "$wgeturl") wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O "${mbtmp}/${wgetfilename}" "$wgeturl"
[ $? -eq 0 ] && result="200"
else else
result1=$(curl -skL --connect-timeout 10 -m 20 -w %{http_code} -o "${mbtmp}/${wgetfilename}" "$wgeturl") result1=$(curl -skL --connect-timeout 10 -m 20 -w %{http_code} -o "${mbtmp}/${wgetfilename}" "$wgeturl")
fi fi
[ -f "${mbtmp}/${wgetfilename}" ] && result2=$(du -sh "${mbtmp}/${wgetfilename}" 2> /dev/null | awk '{print$1}') [ -f "${mbtmp}/${wgetfilename}" ] && result2=$(du -sh "${mbtmp}/${wgetfilename}" 2> /dev/null | awk '{print$1}')
if echo -n "$result1" | grep -q "200" && [ "$result2" != '0' ]; then if [ "$result" = "200" ] && [ "$result2" != '0' ]; then
chmod +x ${mbtmp}/${wgetfilename} > /dev/null 2>&1 chmod +x ${mbtmp}/${wgetfilename} > /dev/null 2>&1
mv -f ${mbtmp}/${wgetfilename} $wgetfilepath > /dev/null 2>&1 mv -f ${mbtmp}/${wgetfilename} $wgetfilepath > /dev/null 2>&1
return 0 return 0
@@ -32,6 +33,7 @@ wgetlist() {
wget --no-check-certificate -q -O - "$1" wget --no-check-certificate -q -O - "$1"
else else
curl -kfsSl "$1" curl -kfsSl "$1"
fi
} }
base_encode() { base_encode() {

5
install.sh
View File

@@ -48,11 +48,12 @@ fi
logsh "【Tools】" "下载工具箱文件..." logsh "【Tools】" "下载工具箱文件..."
rm -rf ${mbtmp}/mixbox.tar.gz > /dev/null 2>&1 rm -rf ${mbtmp}/mixbox.tar.gz > /dev/null 2>&1
if command -v wget-ssl &> /dev/null; then if command -v wget-ssl &> /dev/null; then
result=$(wget-ssl --no-check-certificate --tries=1 --timeout=10 --spider -nv -O ${mbtmp}/mixbox.tar.gz ${mburl}/appstore/mixbox_${model}.tar.gz) wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O ${mbtmp}/mixbox.tar.gz ${mburl}/appstore/mixbox_${model}.tar.gz
[ $? -eq 0 ] && result="200"
else else
result=$(curl -w %{http_code} -skLo ${mbtmp}/mixbox.tar.gz ${mburl}/appstore/mixbox_${model}.tar.gz) result=$(curl -w %{http_code} -skLo ${mbtmp}/mixbox.tar.gz ${mburl}/appstore/mixbox_${model}.tar.gz)
fi fi
! echo -n "$result" | grep -q "200" && logsh "【Tools】" "文件下载失败！" && exit 1 [ "$result" != "200" ] && logsh "【Tools】" "文件下载失败！" && exit 1
logsh "【Tools】" "解压工具箱文件" logsh "【Tools】" "解压工具箱文件"
tar -zxvf ${mbtmp}/mixbox.tar.gz -C ${mbtmp} tar -zxvf ${mbtmp}/mixbox.tar.gz -C ${mbtmp}
[ $? -ne 0 ] && logsh "【Tools】" "文件解压失败！" && exit 1 [ $? -ne 0 ] && logsh "【Tools】" "文件解压失败！" && exit 1