Merge pull request #3635 from MilhouseVH/le10_oem_splash_cleanup

init: clean up splash image selection
This commit is contained in:
Jernej Škrabec 2019-07-11 01:20:45 +02:00 committed by GitHub
commit 71b398edf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -403,21 +403,17 @@ load_splash() {
if [ -z "$SPLASHIMAGE" ]; then if [ -z "$SPLASHIMAGE" ]; then
vres="$(fbset 2>/dev/null | awk '/geometry/ { print $3 }')" vres="$(fbset 2>/dev/null | awk '/geometry/ { print $3 }')"
if [ -f /flash/oemsplash.png -o -f /flash/oemsplash-1080.png ]; then for s in /flash/oemsplash-${vres}.png \
if [ -n "$vres" -a -f /flash/oemsplash-$vres.png ]; then /flash/oemsplash-1080.png \
SPLASHIMAGE="/flash/oemsplash-$vres.png" /flash/oemsplash.png \
elif [ -f /flash/oemsplash-1080.png ]; then /splash/splash-${vres}.png \
SPLASHIMAGE="/flash/oemsplash-1080.png" /splash/splash-1080.png \
else ; do
SPLASHIMAGE="/flash/oemsplash.png" if [ -f "${s}" ]; then
SPLASHIMAGE="${s}"
break
fi fi
else done
if [ -n "$vres" -a -f /splash/splash-$vres.png ]; then
SPLASHIMAGE="/splash/splash-$vres.png"
else
SPLASHIMAGE="/splash/splash-1080.png"
fi
fi
fi fi
if [ -n "$SPLASHIMAGE" -a -f "$SPLASHIMAGE" ]; then if [ -n "$SPLASHIMAGE" -a -f "$SPLASHIMAGE" ]; then