From 3e1563cb68286e337cbc350bb52090ed72e7402a Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 2 Jul 2019 16:28:25 +0100
Subject: [PATCH] init: clean up splash image selection

---
 packages/sysutils/busybox/scripts/init | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index c0e3340f88..7636b91322 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -409,21 +409,17 @@ load_splash() {
       if [ -z "$SPLASHIMAGE" ]; then
         vres="$(fbset 2>/dev/null | awk '/geometry/ { print $3 }')"
 
-        if [ -f /flash/oemsplash.png -o -f /flash/oemsplash-1080.png ]; then
-          if [ -n "$vres" -a -f /flash/oemsplash-$vres.png ]; then
-            SPLASHIMAGE="/flash/oemsplash-$vres.png"
-          elif [ -f /flash/oemsplash-1080.png ]; then
-            SPLASHIMAGE="/flash/oemsplash-1080.png"
-          else
-            SPLASHIMAGE="/flash/oemsplash.png"
+        for s in /flash/oemsplash-${vres}.png \
+                 /flash/oemsplash-1080.png \
+                 /flash/oemsplash.png \
+                 /splash/splash-${vres}.png \
+                 /splash/splash-1080.png \
+                 ; do
+          if [ -f "${s}" ]; then
+            SPLASHIMAGE="${s}"
+            break
           fi
-        else
-          if [ -n "$vres" -a -f /splash/splash-$vres.png ]; then
-            SPLASHIMAGE="/splash/splash-$vres.png"
-          else
-            SPLASHIMAGE="/splash/splash-1080.png"
-          fi
-        fi
+        done
       fi
 
       if [ -n "$SPLASHIMAGE" -a -f "$SPLASHIMAGE" ]; then