Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1393 from jp-bennett/patch-2

Browse source 
Luci-app-fwknopd: add quotation marks to squash error
This commit is contained in:
Hannu Nyman 2017-10-16 17:56:01 +03:00 committed by GitHub
commit 19f30d07cc
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh
View file

@ -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"