peerstore: fix

[oweals/gnunet.git] / contrib / gnunet-gns-import.sh

diff --git a/contrib/gnunet-gns-import.sh b/contrib/gnunet-gns-import.sh
index dacdf78878be5cbf3971ae19707ec609a0b8c167..0ad3ab1d284814b041a2671a1fd42075e7b64d33 100755 (executable)
--- a/contrib/gnunet-gns-import.sh
+++ b/contrib/gnunet-gns-import.sh
@@ -2,6 +2,25 @@
 # This shell-script will import some GNS authorities into your GNS
 # namestore.
 
+LOCATION=$(which gnunet-config)
+if [ -z $LOCATION ]
+then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version 1> /dev/null
+if test $? != 0
+then
+       echo "GNUnet command line tools not found, check environmental variables PATH and GNUNET_PREFIX"
+       exit 1
+fi
+
+gnunet-arm -I 1> /dev/null 2>/dev/null
+if [ ! $? -eq 0 ]
+then
+       echo "GNUnet is not running, please start GNUnet before running import"
+       exit 1
+fi
+
 options=''
 
 while getopts "c:" opt; do
@@ -31,6 +50,8 @@ gnunet-identity -C sks-zone $options
 # Integrate those with the respective subsystems.
 gnunet-identity -e short-zone -s gns-short $options
 gnunet-identity -e master-zone -s gns-master $options
+gnunet-identity -e master-zone -s namestore $options
+gnunet-identity -e master-zone -s gns-proxy $options
 gnunet-identity -e private-zone -s gns-private $options
 gnunet-identity -e sks-zone -s fs-sks $options
 
@@ -38,11 +59,26 @@ gnunet-identity -e sks-zone -s fs-sks $options
 MASTER=`gnunet-identity -d $options | grep master-zone | awk '{print $3}'`
 SHORT=`gnunet-identity -d $options | grep short-zone | awk '{print $3}'`
 PRIVATE=`gnunet-identity -d $options | grep private-zone | awk '{print $3}'`
+PIN=72QC35CO20UJN1E91KPJFNT9TG4CLKAPB4VK9S3Q758S9MLBRKOG
 
 # Link short and private zones into master zone
-gnunet-namestore -z master-zone -a -e never -n private -p -t PKEY -V $PRIVATE $options
-gnunet-namestore -z master-zone -a -e never -n short -p -t PKEY -V $SHORT $options
+if (gnunet-namestore -z master-zone -D -n private -t PKEY | grep "PKEY: $PRIVATE" 1>/dev/null)
+then
+  echo "Private zone link exists, skipping"
+else
+  gnunet-namestore -z master-zone -a -e never -n private -p -t PKEY -V $PRIVATE $options
+fi
+if (gnunet-namestore -z master-zone -D -n short -t PKEY | grep "PKEY: $SHORT" 1>/dev/null)
+then
+  echo "Shorten zone link exists, skipping"
+else
+  gnunet-namestore -z master-zone -a -e never -n short -p -t PKEY -V $SHORT $options
+fi
 
 # Link GNUnet's FCFS zone into master zone under label "pin"
-gnunet-namestore -z master-zone -a -e never -n pin -p -t PKEY -V 72QC35CO20UJN1E91KPJFNT9TG4CLKAPB4VK9S3Q758S9MLBRKOG $options
-
+if (gnunet-namestore -z master-zone -D -n pin -t PKEY | grep "PKEY: $PIN" 1>/dev/null)
+then
+  echo "Pin zone link exists, skipping"
+else
+  gnunet-namestore -z master-zone -a -e never -n pin -p -t PKEY -V $PIN $options
+fi