|
@@ -660,17 +660,17 @@ function install_cjdns {
|
660
|
660
|
if [ $CJDNS_PRIVATE_KEY ]; then
|
661
|
661
|
sed -i "s/\"privateKey\":.*/\"privateKey\": \"$CJDNS_PRIVATE_KEY\",/g" /etc/cjdns/cjdroute.conf
|
662
|
662
|
else
|
663
|
|
- CJDNS_PRIVATE_KEY=$(cat /etc/cjdns/cjdroute.conf | grep '"privateKey"' | awk -F '"' '{print $4}')
|
|
663
|
+ CJDNS_PRIVATE_KEY=$(cat /etc/cjdns/cjdroute.conf | grep '"privateKey"' | awk -F '"' '{print $4}' | sed -n 1p)
|
664
|
664
|
fi
|
665
|
665
|
if [ $CJDNS_PUBLIC_KEY ]; then
|
666
|
666
|
sed -i "s/\"publicKey\":.*/\"publicKey\": \"$CJDNS_PUBLIC_KEY\",/g" /etc/cjdns/cjdroute.conf
|
667
|
667
|
else
|
668
|
|
- CJDNS_PUBLIC_KEY=$(cat /etc/cjdns/cjdroute.conf | grep '"publicKey"' | awk -F '"' '{print $4}')
|
|
668
|
+ CJDNS_PUBLIC_KEY=$(cat /etc/cjdns/cjdroute.conf | grep '"publicKey"' | awk -F '"' '{print $4}' | sed -n 1p)
|
669
|
669
|
fi
|
670
|
670
|
if [ $CJDNS_IPV6 ]; then
|
671
|
671
|
sed -i "s/\"ipv6\":.*/\"ipv6\": \"$CJDNS_IPV6\",/g" /etc/cjdns/cjdroute.conf
|
672
|
672
|
else
|
673
|
|
- CJDNS_IPV6=$(cat /etc/cjdns/cjdroute.conf | grep '"ipv6"' | awk -F '"' '{print $4}')
|
|
673
|
+ CJDNS_IPV6=$(cat /etc/cjdns/cjdroute.conf | grep '"ipv6"' | awk -F '"' '{print $4}' | sed -n 1p)
|
674
|
674
|
fi
|
675
|
675
|
if [ $CJDNS_PASSWORD ]; then
|
676
|
676
|
sed -i "0,/{\"password\":.*/s//{\"password\": \"$CJDNS_PASSWORD\"}/g" /etc/cjdns/cjdroute.conf
|
|
@@ -680,7 +680,7 @@ function install_cjdns {
|
680
|
680
|
if [ $CJDNS_PORT ]; then
|
681
|
681
|
sed -i "s/\"bind\": \"0.0.0.0:.*/\"bind\": \"0.0.0.0:$CJDNS_PORT\",/g" /etc/cjdns/cjdroute.conf
|
682
|
682
|
else
|
683
|
|
- CJDNS_PORT=$(cat /etc/cjdns/cjdroute.conf | grep '"bind": "0.0.0.0:' | awk -F '"' '{print $4}' | awk -F ':' '{print $2}')
|
|
683
|
+ CJDNS_PORT=$(cat /etc/cjdns/cjdroute.conf | grep '"bind": "0.0.0.0:' | awk -F '"' '{print $4}' | awk -F ':' '{print $2}' | sed -n 1p)
|
684
|
684
|
fi
|
685
|
685
|
|
686
|
686
|
# endure that ipv6 is enabled and can route
|