Navigation Menu

Skip to content

Commit

Permalink
anon-shared-helper-scripts -> helper-scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Schleizer committed May 12, 2019
1 parent 55b9b8d commit 8c45de0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -27,7 +27,7 @@ If you have the curl-scripts package installed, it will show a nicer progress
bar when run in terminal and more meaningful curl exit code messages, when
curl failed.

When having the anon-shared-helper-scripts package installed (recommended for
When having the helper-scripts package installed (recommended for
Anonymity Distributions), Tor Browser Downloader will check, that Tor is
enabled, that no package manager is currently running and that Tor finished
bootstrapping before download attempts.
Expand Down
4 changes: 2 additions & 2 deletions debian/control
Expand Up @@ -15,7 +15,7 @@ Package: tb-updater
Architecture: all
Depends: msgcollector-gui, curl, psmisc, gpg-bash-lib, pv, bsdtar,
sudo, ${misc:Depends}
Recommends: tb-starter, anon-icon-pack, anon-shared-helper-scripts,
Recommends: tb-starter, anon-icon-pack, helper-scripts,
curl-scripts
Suggests: tb-default-browser, open-link-confirmation
Description: Tor Browser Downloader by Whonix developers
Expand Down Expand Up @@ -46,7 +46,7 @@ Description: Tor Browser Downloader by Whonix developers
bar when run in terminal and more meaningful curl exit code messages, when
curl failed.
.
When having the anon-shared-helper-scripts package installed (recommended for
When having the helper-scripts package installed (recommended for
Anonymity Distributions), Tor Browser Downloader will check, that Tor is
enabled, that no package manager is currently running and that Tor finished
bootstrapping before download attempts.
Expand Down
16 changes: 8 additions & 8 deletions usr/bin/update-torbrowser
Expand Up @@ -637,7 +637,7 @@ tb_preparation() {
fi
fi

## Required for /usr/lib/anon-shared-helper-scripts/tor_bootstrap_check.bsh.
## Required for /usr/lib/helper-scripts/tor_bootstrap_check.bsh.
TEMP_DIR="$tb_temp_folder"
export TEMP_DIR
rm --recursive --force "$TEMP_DIR"
Expand Down Expand Up @@ -791,7 +791,7 @@ tb_preparation() {
fi
elif [ -f /usr/share/anon-dist/marker ]; then
## sets: GATEWAY_IP
eval $(/usr/lib/anon-shared-helper-scripts/settings_echo)
eval $(/usr/lib/helper-scripts/settings_echo)
[ -n "$SOCKS_PORT_TBB_DOWNLOAD" ] || SOCKS_PORT_TBB_DOWNLOAD="9115"
if [ "$socks_user_name" = "" ]; then
local uuid_temp
Expand Down Expand Up @@ -856,10 +856,10 @@ tb_connectivity_checks_tor() {
return 0
fi

if [ -x /usr/lib/anon-shared-helper-scripts/tor_enabled_check ]; then
if [ -x /usr/lib/helper-scripts/tor_enabled_check ]; then
echo -n "INFO: Running Tor enabled check... "

source /usr/lib/anon-shared-helper-scripts/tor_enabled_check
source /usr/lib/helper-scripts/tor_enabled_check
## sets: TOR_ENABLED
check_tor_enabled_do

Expand All @@ -883,12 +883,12 @@ You could use <code>--no-tor-con-check</code> if you think function <code>$FUNCN
fi
echo "Done."
else
true "/usr/lib/anon-shared-helper-scripts/tor_enabled_check does not exist, skipping."
true "/usr/lib/helper-scripts/tor_enabled_check does not exist, skipping."
fi

if [ -x /usr/lib/anon-shared-helper-scripts/tor_bootstrap_check.bsh ]; then
if [ -x /usr/lib/helper-scripts/tor_bootstrap_check.bsh ]; then
echo -n "INFO: Running Tor bootstrap check... "
source /usr/lib/anon-shared-helper-scripts/tor_bootstrap_check.bsh
source /usr/lib/helper-scripts/tor_bootstrap_check.bsh
## sets: tor_bootstrap_percent
tb_run_function check_tor_circuit_established

Expand All @@ -912,7 +912,7 @@ You could use <code>--no-tor-con-check</code> if you think function <code>$FUNCN
fi
echo "Done."
else
true "/usr/lib/anon-shared-helper-scripts/tor_bootstrap_check.bsh not available, skipping."
true "/usr/lib/helper-scripts/tor_bootstrap_check.bsh not available, skipping."
fi

true "Tor fully bootstrapped."
Expand Down

0 comments on commit 8c45de0

Please sign in to comment.