moved configs into environment (#17)

* moved configs into environment

* fixed copy pasta

* changed proxyuser to proxy in data paths

* fixed typo
This commit is contained in:
Markus Wolf
2018-10-12 20:10:31 +03:00
committed by kexkey
parent 74e4fc9fbf
commit e1ee367430
8 changed files with 38 additions and 15 deletions

View File

@@ -1,7 +1,6 @@
#!/bin/sh
. ./trace.sh
. ./utils.sh
deriveindex()
{
@@ -10,8 +9,8 @@ deriveindex()
local index=${1}
trace "[deriveindex] index=${index}"
local pub32=$(get_prop "derivation.pub32")
local path=$(get_prop "derivation.path" | sed -En "s/n/${index}/p")
local pub32=$DERIVATION_PUB32
local path=$(echo -e $DERIVATION_PATH | sed -En "s/n/${index}/p")
# pub32=$(grep "derivation.pub32" config.properties | cut -d'=' -f2)
# path=$(grep "derivation.path" config.properties | cut -d'=' -f2 | sed -En "s/n/${index}/p")
@@ -43,4 +42,4 @@ send_to_pycoin()
trace_rc ${returncode}
return ${returncode}
}
}