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

diff --git a/start b/start
index 6bf6668..e0d0bc9 100755
--- a/start
+++ b/start
@@ -14,9 +14,7 @@ if [ ! -f $electrum_config ]; then
     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"
@@ -24,12 +22,15 @@ if ! [ "$path" ]; then
     # we're actually forcing fulltree with this clause, which is ok if displaying v0.9 should use fulltree 
 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
-	wget -O - "http://foundry.electrum.org/leveldb-dump/electrum-fulltree-100-latest.tar.gz" | tar -C $path --strip-components 1 -xvfz -
+	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