diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-10-16 17:56:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 17:56:01 +0300 |
| commit | 19f30d07cce1a609f14b91a1f0d4caa110d5aa42 (patch) | |
| tree | f39ac9024bb6c5fb54ccb74206bf7746050dbf3b | |
| parent | a47dd6ec057c1559c3a2effc41ae9dcc84856ebc (diff) | |
| parent | 9be2b760969cd5ddca8f41f7ad95cc4b99bb336c (diff) | |
Merge pull request #1393 from jp-bennett/patch-2
Luci-app-fwknopd: add quotation marks to squash error
| -rw-r--r-- | applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh | 18 |
1 files changed, 9 insertions, 9 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..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,23 +4,23 @@ 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 +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 -qrencode -o - "$qr" +qrencode -t svg -o - "$qr" |