fix something

This commit is contained in:
Ing 2023-09-04 22:01:55 +08:00
parent 63dea24423
commit d7468cade5
3 changed files with 8 additions and 6 deletions

View File

@ -239,7 +239,7 @@ else
BOOTWAIT=$((BOOTWAIT - 1)) BOOTWAIT=$((BOOTWAIT - 1))
done done
rm -f WB WC rm -f WB WC
echo -en "\r$(printf "%${#MSG}s" " ")\n" echo -en "\r$(printf "%$((${#MSG} * 3))s" " ")\n"
fi fi
echo -e "\033[1;37m$(TEXT "Loading DSM kernel...")\033[0m" echo -e "\033[1;37m$(TEXT "Loading DSM kernel...")\033[0m"

View File

@ -926,11 +926,13 @@ function extractDsmFiles() {
# 1 - model # 1 - model
function getLogo() { function getLogo() {
rm -f "${CACHE_PATH}/logo.png" rm -f "${CACHE_PATH}/logo.png"
STATUS=$(curl -skL -w "%{http_code}" "https://www.synology.com/api/products/getPhoto?product=${MODEL/+/%2B}&type=img_s&sort=0" -o "${CACHE_PATH}/logo.png") if [ "${DSMLOGO}" = "true" ]; then
if [ $? -ne 0 -o ${STATUS} -ne 200 -o -f "${CACHE_PATH}/logo.png" ]; then STATUS=$(curl -skL -w "%{http_code}" "https://www.synology.com/api/products/getPhoto?product=${MODEL/+/%2B}&type=img_s&sort=0" -o "${CACHE_PATH}/logo.png")
convert -rotate 180 "${CACHE_PATH}/logo.png" "${CACHE_PATH}/logo.png" 2>/dev/null if [ $? -ne 0 -o ${STATUS} -ne 200 -o -f "${CACHE_PATH}/logo.png" ]; then
magick montage "${CACHE_PATH}/logo.png" -background 'none' -tile '3x3' -geometry '350x210' "${CACHE_PATH}/logo.png" 2>/dev/null convert -rotate 180 "${CACHE_PATH}/logo.png" "${CACHE_PATH}/logo.png" 2>/dev/null
convert -rotate 180 "${CACHE_PATH}/logo.png" "${CACHE_PATH}/logo.png" 2>/dev/null magick montage "${CACHE_PATH}/logo.png" -background 'none' -tile '3x3' -geometry '350x210' "${CACHE_PATH}/logo.png" 2>/dev/null
convert -rotate 180 "${CACHE_PATH}/logo.png" "${CACHE_PATH}/logo.png" 2>/dev/null
fi
fi fi
} }