Browse Source

Only use the first instance

Bob Mottram 10 years ago
parent
commit
4bdcc04286
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      install-freedombone.sh

+ 4
- 4
install-freedombone.sh View File

660
   if [ $CJDNS_PRIVATE_KEY ]; then
660
   if [ $CJDNS_PRIVATE_KEY ]; then
661
       sed -i "s/\"privateKey\":.*/\"privateKey\": \"$CJDNS_PRIVATE_KEY\",/g" /etc/cjdns/cjdroute.conf
661
       sed -i "s/\"privateKey\":.*/\"privateKey\": \"$CJDNS_PRIVATE_KEY\",/g" /etc/cjdns/cjdroute.conf
662
   else
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
   fi
664
   fi
665
   if [ $CJDNS_PUBLIC_KEY ]; then
665
   if [ $CJDNS_PUBLIC_KEY ]; then
666
       sed -i "s/\"publicKey\":.*/\"publicKey\": \"$CJDNS_PUBLIC_KEY\",/g" /etc/cjdns/cjdroute.conf
666
       sed -i "s/\"publicKey\":.*/\"publicKey\": \"$CJDNS_PUBLIC_KEY\",/g" /etc/cjdns/cjdroute.conf
667
   else
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
   fi
669
   fi
670
   if [ $CJDNS_IPV6 ]; then
670
   if [ $CJDNS_IPV6 ]; then
671
       sed -i "s/\"ipv6\":.*/\"ipv6\": \"$CJDNS_IPV6\",/g" /etc/cjdns/cjdroute.conf
671
       sed -i "s/\"ipv6\":.*/\"ipv6\": \"$CJDNS_IPV6\",/g" /etc/cjdns/cjdroute.conf
672
   else
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
   fi
674
   fi
675
   if [ $CJDNS_PASSWORD ]; then
675
   if [ $CJDNS_PASSWORD ]; then
676
       sed -i "0,/{\"password\":.*/s//{\"password\": \"$CJDNS_PASSWORD\"}/g" /etc/cjdns/cjdroute.conf
676
       sed -i "0,/{\"password\":.*/s//{\"password\": \"$CJDNS_PASSWORD\"}/g" /etc/cjdns/cjdroute.conf
680
   if [ $CJDNS_PORT ]; then
680
   if [ $CJDNS_PORT ]; then
681
       sed -i "s/\"bind\": \"0.0.0.0:.*/\"bind\": \"0.0.0.0:$CJDNS_PORT\",/g" /etc/cjdns/cjdroute.conf
681
       sed -i "s/\"bind\": \"0.0.0.0:.*/\"bind\": \"0.0.0.0:$CJDNS_PORT\",/g" /etc/cjdns/cjdroute.conf
682
   else
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
   fi
684
   fi
685
 
685
 
686
   # endure that ipv6 is enabled and can route
686
   # endure that ipv6 is enabled and can route