Use packaged torsocks rather than building it

telepresenceio · May 29, 2020 · 8008707 · 8008707
1 parent 81e1b4b
commit 8008707
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/ci/build-torsocks.sh b/ci/build-torsocks.sh
diff --git a/environment-setup.sh b/environment-setup.sh
@@ -22,13 +22,13 @@ case "${OS}" in
         brew update > /dev/null
         brew install python3 || brew upgrade python || brew link --overwrite python
         brew cask install osxfuse
-        brew install sshfs
+        brew install sshfs torsocks
         pip3 install virtualenv
         ;;
 
     linux)
         sudo apt-get install \
-             sshfs conntrack \
+             sshfs conntrack torsocks \
              lsb-release
         ;;
 
@@ -47,8 +47,5 @@ docker version || true
 # Make sure gcloud is installed.  This includes kubectl.
 ./ci/setup-gcloud.sh "${PROJECT_NAME}" "${CLUSTER_NAME}" "${CLOUDSDK_COMPUTE_ZONE}" "${OS}"
 
-# Make sure torsocks is installed:
-./ci/build-torsocks.sh "${OS}"
-
 # Make sure Docker sshfs plugin is installed.
 docker plugin install --grant-all-permissions vieux/sshfs || true