X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=start;h=6bf666817022d239842b52c9dfdb8de5aead50aa;hp=e00bdd9c57aa182a5770ac7de8f185e036b8c5d2;hb=5bf13f457fcb02e4cf1de3796064d9ce4041e07e;hpb=199e1b06dd48580b19274723e51073ce076d8a1f

diff --git a/start b/start
index e00bdd9..6bf6668 100755
--- a/start
+++ b/start
@@ -1,19 +1,37 @@
 #!/bin/bash
 
-path=`grep path_fulltree /etc/electrum.conf |awk -F\= '{print $2}'`
+PID=`/usr/bin/python server.py getpid`
+if [[ $PID != *[!0-9]* ]]; then
+    echo "Server already running (pid $PID)"
+    exit
+fi
+
+
+electrum_config="/etc/electrum.conf"
+
+if [ ! -f $electrum_config ]; then
+    echo "$electrum_config does not exist"
+    exit
+fi
+
+path=`grep path_fulltree $electrum_config |awk -F\= '{print $2}'`
+
+#needs more hardening against double definiton of variable, dismiss commented ones
+
+if ! [ "$path" ]; then
+    echo "Variable path_fulltree not set in $electrum_config"
+    exit
+    # we're actually forcing fulltree with this clause, which is ok if displaying v0.9 should use fulltree 
+fi
 
 if [ ! -d $path ]; then
     echo "Database not found in $path."
-    read -p "Do you want to download it from the Electrum foundry? " -n 1 -r
+    read -p "Do you want to download it from the Electrum foundry to $path ? " -n 1 -r
     echo
     if [[ $REPLY =~ ^[Yy]$ ]]; then
-	rm -rf fulltree fulltree.tar
-	wget http://foundry.electrum.org/leveldb-dump/electrum-fulltree-100-latest.tar -O fulltree.tar
-	tar -xvf fulltree.tar
-	mv fulltree $path
-	rm -rf fulltree fulltree.tar
+	wget -O - "http://foundry.electrum.org/leveldb-dump/electrum-fulltree-100-latest.tar.gz" | tar -C $path --strip-components 1 -xvfz -
     fi
 fi
 
-echo "starting server as daemon"
+echo "Starting server as daemon"
 nohup /usr/bin/python -u server.py &> /var/log/electrum.log &