optimize call to ddmesh-utils-wifi-info.sh

files/18.06/usr/lib/www/page-pre.sh

@@ -11,6 +11,7 @@ fi
 
 . /usr/lib/www/page-functions.sh
 eval $(/usr/lib/ddmesh/ddmesh-utils-network-info.sh all)
+eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
 
 # get model
 eval $(cat /etc/board.json | jsonfilter -e model='@.model.id' -e model2='@.model.name')

files/common/usr/lib/www/page-pre.sh

@@ -11,6 +11,7 @@ fi
 
 . /usr/lib/www/page-functions.sh
 eval $(/usr/lib/ddmesh/ddmesh-utils-network-info.sh all)
+eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
 
 # get model
 eval $(cat /etc/board.json | jsonfilter -e model='@.model.id' -e model2='@.model.name')

files/common/www/admin/28-wlanscan.sh

@@ -2,8 +2,6 @@
 # Copyright (C) 2010 Stephan Enderlein <stephan@freifunk-dresden.de>
 # GNU General Public License Version 3
 
-eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
-
 if [ "$wifi_status_radio2g_up" = "1" ]; then
 cat<<EOM
 <tr><td><div class="plugin"><a class="plugin" href="wlanscan.cgi">WLAN-Scan</a></div></td></tr>

files/common/www/admin/48-wifi-2g.sh

@@ -2,8 +2,6 @@
 # Copyright (C) 2010 Stephan Enderlein <stephan@freifunk-dresden.de>
 # GNU General Public License Version 3
 
-eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
-
 if [ "$wifi_status_radio2g_up" = "1" ]; then
 cat<<EOM
 <tr><td><div class="plugin"><a class="plugin" href="wifi-2g.cgi">WiFi 2.4 GHz</a></div></td></tr>

files/common/www/admin/49-wifi-5g.sh

@@ -2,8 +2,6 @@
 # Copyright (C) 2010 Stephan Enderlein <stephan@freifunk-dresden.de>
 # GNU General Public License Version 3
 
-eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
-
 if [ "$wifi_status_radio5g_up" = "1" ]; then
 cat<<EOM
 <tr><td><div class="plugin"><a class="plugin" href="wifi-5g.cgi">WiFi 5 GHz</a></div></td></tr>

files/common/www/admin/ajax-wlan.cgi

@@ -9,12 +9,6 @@ echo ''
 }
 
 WIDTH=150
-
-
-eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
-
-
-
 SCAN_RESULT=/tmp/wifi_scan
 
 /usr/sbin/iw dev wifi2ap scan > $SCAN_RESULT

files/common/www/admin/autosetup.cgi

@@ -10,7 +10,6 @@ else
 fi
 
 . /usr/lib/www/page-pre.sh ${0%/*}
-eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
 
 WIDTH=100
 

files/common/www/admin/index.cgi

@@ -11,7 +11,6 @@ if [ "$form_action" = "overlay" ]; then
 	/usr/lib/ddmesh/ddmesh-overlay-md5sum.sh write >/dev/null
 fi
 
-eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
 eval $(sed 's#:\(.*\)$#="\1"#' /etc/built_info)
 
 case  "$git_ddmesh_branch" in

files/common/www/admin/wifi-2g.cgi

@@ -5,7 +5,6 @@
 export TITLE="Verwaltung > Konfiguration: WIFI 2.4GHz"
 
 . /usr/lib/www/page-pre.sh ${0%/*}
-eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
 
 cat<<EOF
 <h2>$TITLE</h2>

files/common/www/admin/wifi-5g.cgi

@@ -5,7 +5,6 @@
 export TITLE="Verwaltung > Konfiguration: WIFI 5GHz"
 
 . /usr/lib/www/page-pre.sh ${0%/*}
-eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
 
 cat<<EOF
 <h2>$TITLE</h2>

files/common/www/status.cgi

@@ -6,7 +6,6 @@ export TITLE="Infos > Status"
 
 . /usr/share/libubox/jshn.sh
 . /usr/lib/www/page-pre.sh
-eval $(/usr/lib/ddmesh/ddmesh-utils-wifi-info.sh)
 
 RESOLV_PATH="/tmp/resolv.conf.d"
 RESOLV_FINAL="${RESOLV_PATH}/resolv.conf.final"

[Niklas]

@stephan An dieser Stelle wird das util weiterhin benötigt, da sonst der WLAN Scan 5 GHz nicht mehr funktioniert.