projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/meshwizard: Fix setting of values which contain spaces & cleanups
[project/luci.git]
/
contrib
/
package
/
meshwizard
/
files
/
usr
/
bin
/
meshwizard
/
wizard.sh
diff --git
a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
index
f4e7af2
..
113d905
100755
(executable)
--- a/
contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
+++ b/
contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
@@
-23,12
+23,9
@@
opkg list_installed |grep luci-app-splash > /dev/null && export has_luci_splash=
echo "+ Renaming wifi-devices in /etc/config/meshwizard"
$dir/helpers/rename-wifi.sh
echo "+ Renaming wifi-devices in /etc/config/meshwizard"
$dir/helpers/rename-wifi.sh
-# Firstboot/initial config
- echo "+ Initial config"
- $dir/helpers/initial_config.sh
-
# Get community
# Get community
-export community=$(uci get freifunk.community.name)
+export community=$(uci -q get meshwizard.community.name)
+[ -z "$community" ] && community=$(uci -q get freifunk.community.name)
[ -z "$community" ] && echo "Error: Community is not set in /etc/config/freifunk, aborting now." && exit 1
# Check whether we want to cleanup uci config before setting new options or not
[ -z "$community" ] && echo "Error: Community is not set in /etc/config/freifunk, aborting now." && exit 1
# Check whether we want to cleanup uci config before setting new options or not
@@
-45,15
+42,20
@@
export networks
echo " Community=$community
Network(s)=$networks"
echo " Community=$community
Network(s)=$networks"
-# Read default values (first from /etc/config/freifunk, then from /etc/config/profile_$community,
+# Read default values (first from /etc/config/freifunk, then from /etc/config/profile_$community
+# then /etc/config/meshwizard
# last will overwrite first
# last will overwrite first
-
$dir/helpers/read_defaults.sh $community > /tmp/meshwizard.tmp
while read line; do
export "${line//\"/}"
done < /tmp/meshwizard.tmp
$dir/helpers/read_defaults.sh $community > /tmp/meshwizard.tmp
while read line; do
export "${line//\"/}"
done < /tmp/meshwizard.tmp
+# Firstboot/initial config
+ echo "+ Initial config"
+ $dir/helpers/initial_config.sh
+
+
$dir/helpers/setup_dnsmasq.sh
$dir/helpers/setup_system.sh
$dir/helpers/setup_freifunk.sh
$dir/helpers/setup_dnsmasq.sh
$dir/helpers/setup_system.sh
$dir/helpers/setup_freifunk.sh