py26reqs.txt needs to be path-relative

Fixes: #1630

1 files changed, 6 insertions, 3 deletions

diff --git a/letsencrypt-auto b/letsencrypt-auto
index 083de58c4..e9b7739d2 100755
--- a/letsencrypt-auto
+++ b/letsencrypt-auto
@@ -14,6 +14,10 @@ XDG_DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
 VENV_NAME="letsencrypt"
 VENV_PATH=${VENV_PATH:-"$XDG_DATA_HOME/$VENV_NAME"}
 VENV_BIN=${VENV_PATH}/bin
+# The path to the letsencrypt-auto script.  Everything that uses these might
+# at some point be inlined...
+LEA_PATH=`dirname "$0"`
+BOOTSTRAP=${LEA_PATH}/bootstrap
 
 # This script takes the same arguments as the main letsencrypt program, but it
 # additionally responds to --verbose (more output) and --debug (allow support
@@ -110,7 +114,6 @@ DeterminePythonVersion() {
 # later steps, causing "ImportError: cannot import name unpack_url"
 if [ ! -d $VENV_PATH ]
 then
-  BOOTSTRAP=`dirname $0`/bootstrap
   if [ ! -f $BOOTSTRAP/debian.sh ] ; then
     echo "Cannot find the letsencrypt bootstrap scripts in $BOOTSTRAP"
     exit 1
@@ -172,7 +175,7 @@ if [ "$VERBOSE" = 1 ]  ; then
   echo
   $VENV_BIN/pip install -U setuptools
   $VENV_BIN/pip install -U pip
-  $VENV_BIN/pip install -r py26reqs.txt -U letsencrypt letsencrypt-apache
+  $VENV_BIN/pip install -r "$LEA_PATH"/py26reqs.txt -U letsencrypt letsencrypt-apache
   # nginx is buggy / disabled for now, but upgrade it if the user has
   # installed it manually
   if $VENV_BIN/pip freeze | grep -q letsencrypt-nginx ; then
@@ -184,7 +187,7 @@ else
   $VENV_BIN/pip install -U pip > /dev/null
   printf .
   # nginx is buggy / disabled for now...
-  $VENV_BIN/pip install -r py26reqs.txt > /dev/null
+  $VENV_BIN/pip install -r "$LEA_PATH"/py26reqs.txt > /dev/null
   printf .
   $VENV_BIN/pip install -U letsencrypt > /dev/null
   printf .