diff --git a/apps/dms/config/dms.uci b/apps/dms/config/dms.uci index 1a2ad39..84fc9e1 100644 --- a/apps/dms/config/dms.uci +++ b/apps/dms/config/dms.uci @@ -5,4 +5,4 @@ backupfiles="" supports="linux_arm,linux_mips,linux_x86_64" appinfo="dms是一款DLNA数字媒体服务器" newinfo="" -version="0.0.1" \ No newline at end of file +version="0.0.2" \ No newline at end of file diff --git a/apps/dms/scripts/dms.sh b/apps/dms/scripts/dms.sh index 0a560bf..279c8ac 100644 --- a/apps/dms/scripts/dms.sh +++ b/apps/dms/scripts/dms.sh @@ -13,7 +13,7 @@ start() { [ -z "$path" ] && echo "媒体目录不能为空!" && exit 1 # open_port # 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 logsh "【$service】" "启动${appname}服务失败!" && end else diff --git a/apps/mixbox/config/mixbox.uci b/apps/mixbox/config/mixbox.uci index 9365154..16b2b1f 100644 --- a/apps/mixbox/config/mixbox.uci +++ b/apps/mixbox/config/mixbox.uci @@ -4,4 +4,4 @@ needver="" supports="linux_arm,linux_mips,linux_x86_64" appinfo="一款支持多平台,多架构的Shell工具箱" newinfo="新增base64_encode工具" -version="0.1.7" +version="0.1.8" diff --git a/apps/mixbox/scripts/helper.sh b/apps/mixbox/scripts/helper.sh index 872d525..62f0ff9 100644 --- a/apps/mixbox/scripts/helper.sh +++ b/apps/mixbox/scripts/helper.sh @@ -10,12 +10,13 @@ wgetsh() { [ ! -d ${mbtmp} ] && mkdir -p ${mbtmp} rm -rf ${mbtmp}/${wgetfilename} 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 result1=$(curl -skL --connect-timeout 10 -m 20 -w %{http_code} -o "${mbtmp}/${wgetfilename}" "$wgeturl") fi [ -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 mv -f ${mbtmp}/${wgetfilename} $wgetfilepath > /dev/null 2>&1 return 0 @@ -32,6 +33,7 @@ wgetlist() { wget --no-check-certificate -q -O - "$1" else curl -kfsSl "$1" + fi } base_encode() { diff --git a/install.sh b/install.sh index 3faba42..1c55a36 100644 --- a/install.sh +++ b/install.sh @@ -48,11 +48,12 @@ fi logsh "【Tools】" "下载工具箱文件..." rm -rf ${mbtmp}/mixbox.tar.gz > /dev/null 2>&1 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 result=$(curl -w %{http_code} -skLo ${mbtmp}/mixbox.tar.gz ${mburl}/appstore/mixbox_${model}.tar.gz) fi -! echo -n "$result" | grep -q "200" && logsh "【Tools】" "文件下载失败!" && exit 1 +[ "$result" != "200" ] && logsh "【Tools】" "文件下载失败!" && exit 1 logsh "【Tools】" "解压工具箱文件" tar -zxvf ${mbtmp}/mixbox.tar.gz -C ${mbtmp} [ $? -ne 0 ] && logsh "【Tools】" "文件解压失败!" && exit 1