X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=start;h=35624d1b9e8e2e9c02e0462aed8e8ce2635df675;hp=9868ce14888c5565515ecc3c9a4a8285163a77b3;hb=HEAD;hpb=65def938815f634f3dca9b28f5cb074585033edc

diff --git a/start b/start
index 9868ce1..35624d1 100755
--- a/start
+++ b/start
@@ -1,15 +1,20 @@
 #!/bin/bash
 
-electrum_config="/etc/electrum.conf"
+PID=`/usr/bin/python server.py getpid`
+if [[ $PID != *[!0-9]* ]]; then
+    echo "Server already running (pid $PID)"
+    exit
+fi
+
+
+electrum_config="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
+path=`grep -e ^path_fulltree $electrum_config |awk -F\= '{print $2}' | tail -n 1`
 
 if ! [ "$path" ]; then
     echo "Variable path_fulltree not set in $electrum_config"
@@ -17,14 +22,17 @@ if ! [ "$path" ]; then
     # 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 to $path ? " -n 1 -r
-    echo
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
-	wget -O - "http://foundry.electrum.org/leveldb-dump/electrum-fulltree-100-latest.tar" | tar -C $path --strip-components 1 -xvf -
-    fi
-fi
+rmdir $path --ignore-fail-on-non-empty
+
+#if [ ! -d $path ]; then
+#    echo "Database not found in $path."
+#    read -p "Do you want to download it from the Electrum foundry to $path ? " -n 1 -r
+#    echo
+#    if [[ $REPLY =~ ^[Yy]$ ]]; then
+#	mkdir -p $path
+#	wget -O - "http://foundry.electrum.org/leveldb-dump/electrum-fulltree-100-latest.tar.gz" | tar --extract --gunzip --strip-components 1 --directory $path --file -
+#    fi
+#fi
 
-echo "starting server as daemon"
-nohup /usr/bin/python -u server.py &> /var/log/electrum.log &
+echo "Starting server as daemon"
+nohup /usr/bin/python -u server.py &> electrum.log &