Merge JoinMarket-Org/joinmarket-clientserver#1319: Use valid `tor_root` also for `tor_install()`

d46a2c6057 Use valid tor_root also for tor_install() (Kristaps Kaupe)

Pull request description:

  Affects combination of `--with-local-tor` and `--docker-install` in `install.sh`. Fixes #1318.

Top commit has no ACKs.

Tree-SHA512: 521d03f9c4f40ea7055b8f3d866b06bd5bd9b1428e56c4e642639681a68418e1c86aaac99804ad7d15f9d435926ba2e850f0479e4d7464c5ed2e26835165c177

install.sh

@@ -351,15 +351,19 @@ libsodium_install ()
     popd
 }
 
-tor_build ()
+tor_root ()
 {
     # jm_root will be empty for --docker-install,
     # sys.prefix defaults to /usr/local
     if [[ -n "$jm_root" ]]; then
-        tor_root="$jm_root"
+        echo "$jm_root"
     else
-        tor_root="/usr/local"
+        echo "/usr/local"
     fi
+}
+
+tor_build ()
+{
     $make uninstall
     $make distclean
     ./configure \
@@ -372,7 +376,7 @@ tor_build ()
         --disable-asciidoc \
         --disable-manpage \
         --disable-html-manual \
-        --prefix="${tor_root}"
+        --prefix="$(tor_root)"
     $make
     if ! $make check; then
         return 1
@@ -397,7 +401,7 @@ Log warn stderr
 SOCKSPort 9050 IsolateDestAddr IsolateDestPort
 ControlPort 9051
 CookieAuthentication 1
-        " > "${jm_root}/etc/tor/torrc"
+        " > "$(tor_root)/etc/tor/torrc"
     else
         return 1
     fi