Browse Source

Use valid tor_root also for tor_install()

master
Kristaps Kaupe 3 years ago
parent
commit
d46a2c6057
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 14
      install.sh

14
install.sh

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

Loading…
Cancel
Save