From: Manuel Munz <freifunk@somakoma.de>
Date: Thu, 29 Sep 2011 09:43:33 +0000 (+0000)
Subject: contrib/meshwizard: Check if luci/luci-splash is installed before trying to setup it
X-Git-Tag: 0.11.0~1684
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=95a97c8d32b9cbf98cedac56ba0c98716793ff8f;p=project%2Fluci.git

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 a5f670dd5f..388886a54f 100755
--- 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 86f60aee1f..f316798c2f 100755
--- 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 c03d11f93b..f4e7af2bc3 100755
--- 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