contrib/meshwizard: Check if luci/luci-splash is installed before trying to setup it

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
index a5f670dd5fb57a60094f4323048fef4d88915cd0..388886a54f1d5ba57677ff14c7699082f30ac641 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
@@ -45,13 +45,15 @@ if [ -n "$(uci -q get meshwizard.contact)" ]; then
        uci -q delete meshwizard.contact
 fi
 
-if [ -n "$(uci -q get meshwizard.luci_main)" ]; then
-       echo "    + Setup luci"
-       uci show meshwizard.luci_main |sed -e 's/^meshwizard/luci/g' -e 's/luci_main/main/' | while read line; do 
-               eval uci set $line
-               echo "    $line"
-       done
-       uci -q delete meshwizard.luci_main
+if [ "$has_luci" == TRUE ]; then
+       if [ -n "$(uci -q get meshwizard.luci_main)" ]; then
+               echo "    + Setup luci"
+               uci show meshwizard.luci_main |sed -e 's/^meshwizard/luci/g' -e 's/luci_main/main/' | while read line; do 
+                       eval uci set $line
+                       echo "    $line"
+               done
+               uci -q delete meshwizard.luci_main
+       fi
 fi
 
 uci commit

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh
index 86f60aee1f5ca35e711db1e0201610e44e17f982..f316798c2f1331b6595fda8f71dae77748ccf3d8 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh
@@ -6,6 +6,11 @@
 
 net=$1
 
+if [ ! "$has_luci_splash" == TRUE ]; then
+       echo "    Luci Splash is not installed, skipping setup of it."
+       exit
+fi
+
 handle_splash() {
        config_get network "$1" network
        if [ "$network" == "${netrenamed}dhcp" ]; then

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
index c03d11f93b39e3dde7196869ab43645e08c75c84..f4e7af2bc378a03d59e03ff40addbd62e269d115 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
@@ -13,6 +13,12 @@ export dir="/usr/bin/meshwizard"
 . $dir/functions.sh
 debug=1
 
+# Check which packages we have installed
+export has_luci=FALSE
+opkg list_installed |grep luci-mod-admin > /dev/null && export has_luci=TRUE
+export has_luci_splash=FALSE
+opkg list_installed |grep luci-app-splash > /dev/null && export has_luci_splash=TRUE
+
 # Rename wifi interfaces
        echo "+ Renaming wifi-devices in /etc/config/meshwizard"
        $dir/helpers/rename-wifi.sh