From patchwork Fri Feb 17 07:06:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v4,01/15] fff-web: fix uci command line syntax From: Tim Niemeyer X-Patchwork-Id: 310 Message-Id: <1487315225-20168-2-git-send-email-tim@tn-x.org> To: franken-dev@freifunk.net Cc: Tim Niemeyer Date: Fri, 17 Feb 2017 08:06:51 +0100 Signed-off-by: Tim Niemeyer Reviewed-by: Christian Dresel Reviewed-by: Jan Kraus --- Changes in v4: None Changes in v3: None Changes in v2: - New Patch .../fff-web/files/www/public/cgi-bin/status.html | 12 +++---- .../fff/fff-web/files/www/ssl/cgi-bin/header | 2 +- .../fff-web/files/www/ssl/cgi-bin/settings.html | 40 +++++++++++----------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html b/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html index afd3b89..968d816 100755 --- a/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html +++ b/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html @@ -2,12 +2,12 @@ <% echo -en "Content-Type: text/html\r\n\r\n" -HOSTNAME=$(uci get -q 'system.@system[0].hostname') +HOSTNAME=$(uci -q get 'system.@system[0].hostname') MAC="$(uci -q get network.mesh.macaddr)" -lat="$(uci get -q system.@system[0].latitude)" -lon="$(uci get -q system.@system[0].longitude)" -contact="$(uci get -q system.@system[0].contact)" +lat="$(uci -q get system.@system[0].latitude)" +lon="$(uci -q get system.@system[0].longitude)" +contact="$(uci -q get system.@system[0].contact)" . /etc/firmware_release @@ -47,11 +47,11 @@ contact="$(uci get -q system.@system[0].contact)" MAC-Adresse:<%= $MAC %> Modell:<% cat /tmp/sysinfo/model 2>/dev/null %> Firmware:<%= ${FIRMWARE_VERSION} %> - Beschreibung:<% uci get -q 'system.@system[0].description' %> + Beschreibung:<% uci -q get 'system.@system[0].description' %> Position:<% if [ -n "$lat" -a -n "$lon" ]; then echo "${lat:0:8}N, ${lon:0:8}E" fi %> - Standort:<% uci get -q 'system.@system[0].position_comment' %> + Standort:<% uci -q get 'system.@system[0].position_comment' %> E-Mail Adresse:<%= $contact %> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header index 4cecfcd..92bdbc6 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header @@ -10,7 +10,7 @@ nav_entry() { echo -ne "\t$2\n\t\t" } -HOSTNAME=$(uci get -q 'system.@system[0].hostname') +HOSTNAME=$(uci -q get 'system.@system[0].hostname') %> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/settings.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/settings.html index 859cf94..a7417dc 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/settings.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/settings.html @@ -13,23 +13,23 @@ if [ "$REQUEST_METHOD" == "POST" ] ; then MSG='Knotenname enthält ungültige Zeichen!' else # Allgemeine Einstellungen - uci set -q "system.@system[0].hostname=${POST_hostname}" - uci get -q 'system.@system[0].hostname' > /proc/sys/kernel/hostname - uci set -q "system.@system[0].description=${POST_description}" - uci set -q "system.@system[0].latitude=${POST_latitude}" - uci set -q "system.@system[0].longitude=${POST_longitude}" - uci set -q "system.@system[0].position_comment=${POST_position_comment}" - uci set -q "system.@system[0].contact=${POST_contact}" + uci -q set "system.@system[0].hostname=${POST_hostname}" + uci -q get 'system.@system[0].hostname' > /proc/sys/kernel/hostname + uci -q set "system.@system[0].description=${POST_description}" + uci -q set "system.@system[0].latitude=${POST_latitude}" + uci -q set "system.@system[0].longitude=${POST_longitude}" + uci -q set "system.@system[0].position_comment=${POST_position_comment}" + uci -q set "system.@system[0].contact=${POST_contact}" # Bitratenbegrenzung if [ "$POST_traffic_limit" == "on" ] ; then - uci set -q "simple-tc.example.ifname=$(uci -q get network.wan.ifname)" - uci set -q "simple-tc.example.enabled=1" + uci -q set "simple-tc.example.ifname=$(uci -q get network.wan.ifname)" + uci -q set "simple-tc.example.enabled=1" else - uci set -q "simple-tc.example.enabled=0" + uci -q set "simple-tc.example.enabled=0" fi - uci set -q "simple-tc.example.limit_ingress=${POST_limit_ingress}" - uci set -q "simple-tc.example.limit_egress=${POST_limit_egress}" + uci -q set "simple-tc.example.limit_ingress=${POST_limit_ingress}" + uci -q set "simple-tc.example.limit_egress=${POST_limit_egress}" uci commit MSG='Daten gespeichert! - Bitte Router neustarten.' @@ -40,7 +40,7 @@ fi <%in /www/ssl/cgi-bin/helpers %> <% # read -if [ "$(uci get -q 'simple-tc.example.enabled')" == "1" ] ; then +if [ "$(uci -q get 'simple-tc.example.enabled')" == "1" ] ; then traffic_checked="checked" else traffic_checked="" @@ -54,16 +54,16 @@ fi Allgemeine Einstellungen - + - + - - - + + +
Knotenname:
Knotenbeschreibung:
Knotenbeschreibung:
GPS Breitengrad:
GPS Längengrad:
Standortbeschreibung:
E-Mail Adresse:
GPS Längengrad:
Standortbeschreibung:
E-Mail Adresse:
@@ -73,8 +73,8 @@ fi Aktiviert: > - Freifunk Download:kbit/s - Freifunk Upload:kbit/s + Freifunk Download:kbit/s + Freifunk Upload:kbit/s