From 085fb17a11c3f955962c143ba4e501c825305b04 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Sun, 15 Oct 2017 21:33:15 -0500 Subject: Luci-app-fwknopd: add quotation marks to squash error In some cases, the missing quotation marks can cause error messages. Although harmless, adding the quotation marks for correctness. Signed-off-by: Jonathan Bennett --- applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh b/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh index abca5d3e5..7825f05d2 100644 --- a/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh +++ b/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh @@ -9,17 +9,17 @@ key=$(uci get fwknopd.@access[$entry_num].KEY) hmac_key_base64=$(uci get fwknopd.@access[$entry_num].HMAC_KEY_BASE64) hmac_key=$(uci get fwknopd.@access[$entry_num].HMAC_KEY) -if [ $key_base64 != "" ]; then +if [ "$key_base64" != "" ]; then qr="KEY_BASE64:$key_base64" fi -if [ $key != "" ]; then +if [ "$key" != "" ]; then qr="$qr KEY:$key" fi -if [ $hmac_key_base64 != "" ]; then +if [ "$hmac_key_base64" != "" ]; then qr="$qr HMAC_KEY_BASE64:$hmac_key_base64" fi -if [ $hmac_key != "" ]; then +if [ "$hmac_key" != "" ]; then qr="$qr HMAC_KEY:$hmac_key" fi -- cgit v1.2.3 From e52a4b5ceab621fb35d1ebd7f838eb6c4c7c06d2 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Sun, 15 Oct 2017 22:12:18 -0500 Subject: luci-app-fwknopd: Prep for libqrencode update An update for libqrencode requires that we explicitly ask for an SVG output. This continues to work properly with the old version. Making the change here before updating the libqrencode package. Signed-off-by: Jonathan Bennett --- applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh b/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh index 7825f05d2..f525c2abd 100644 --- a/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh +++ b/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh @@ -23,4 +23,4 @@ if [ "$hmac_key" != "" ]; then qr="$qr HMAC_KEY:$hmac_key" fi -qrencode -o - "$qr" +qrencode -t svg -o - "$qr" -- cgit v1.2.3 From 9be2b760969cd5ddca8f41f7ad95cc4b99bb336c Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Sun, 15 Oct 2017 22:21:05 -0500 Subject: luci-app-fwknopd: add the -q option to UCI Thanks to spacezorro on Github for suggesting this. The quiet tag suppresses the error messages if no key is present. --- applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh b/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh index f525c2abd..cfd71525c 100644 --- a/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh +++ b/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh @@ -4,10 +4,10 @@ if [ "$1" != "" ]; then entry_num=$1 fi -key_base64=$(uci get fwknopd.@access[$entry_num].KEY_BASE64) -key=$(uci get fwknopd.@access[$entry_num].KEY) -hmac_key_base64=$(uci get fwknopd.@access[$entry_num].HMAC_KEY_BASE64) -hmac_key=$(uci get fwknopd.@access[$entry_num].HMAC_KEY) +key_base64=$(uci -q get fwknopd.@access[$entry_num].KEY_BASE64) +key=$(uci -q get fwknopd.@access[$entry_num].KEY) +hmac_key_base64=$(uci -q get fwknopd.@access[$entry_num].HMAC_KEY_BASE64) +hmac_key=$(uci -q get fwknopd.@access[$entry_num].HMAC_KEY) if [ "$key_base64" != "" ]; then qr="KEY_BASE64:$key_base64" -- cgit v1.2.3