From f5580598cda39b9e93393dd618a91accbd7469d2 Mon Sep 17 00:00:00 2001 From: Noah Swartz Date: Mon, 17 Jul 2017 13:08:52 -0700 Subject: [PATCH 1/3] add disable pip version check flag --- certbot-auto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/certbot-auto b/certbot-auto index 599538891..4c923dbf9 100755 --- a/certbot-auto +++ b/certbot-auto @@ -562,7 +562,7 @@ BootstrapMac() { if ! hash virtualenv 2>/dev/null; then say "virtualenv not installed." say "Installing with pip..." - pip install virtualenv + pip install --disable-pip-version-check virtualenv fi } @@ -1045,9 +1045,9 @@ UNLIKELY_EOF PATH="$VENV_BIN:$PATH" "$VENV_BIN/python" "$TEMP_DIR/pipstrap.py" set +e if [ "$VERBOSE" = 1 ]; then - "$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" + "$VENV_BIN/pip" install --disable-pip-version-check --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" else - PIP_OUT=`"$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1` + PIP_OUT=`"$VENV_BIN/pip" install --disable-pip-version-check --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1` fi PIP_STATUS=$? set -e From 1cf8c5a5860b9ba1da16a4e4f60458767c6fa594 Mon Sep 17 00:00:00 2001 From: Noah Swartz Date: Tue, 18 Jul 2017 16:37:03 -0700 Subject: [PATCH 2/3] add changes to template --- certbot-auto | 6 +++--- letsencrypt-auto-source/letsencrypt-auto | 6 +++--- letsencrypt-auto-source/letsencrypt-auto.template | 4 ++-- letsencrypt-auto-source/pieces/bootstrappers/mac.sh | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/certbot-auto b/certbot-auto index 4c923dbf9..599538891 100755 --- a/certbot-auto +++ b/certbot-auto @@ -562,7 +562,7 @@ BootstrapMac() { if ! hash virtualenv 2>/dev/null; then say "virtualenv not installed." say "Installing with pip..." - pip install --disable-pip-version-check virtualenv + pip install virtualenv fi } @@ -1045,9 +1045,9 @@ UNLIKELY_EOF PATH="$VENV_BIN:$PATH" "$VENV_BIN/python" "$TEMP_DIR/pipstrap.py" set +e if [ "$VERBOSE" = 1 ]; then - "$VENV_BIN/pip" install --disable-pip-version-check --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" + "$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" else - PIP_OUT=`"$VENV_BIN/pip" install --disable-pip-version-check --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1` + PIP_OUT=`"$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1` fi PIP_STATUS=$? set -e diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto index 276d68c22..17ee1d509 100755 --- a/letsencrypt-auto-source/letsencrypt-auto +++ b/letsencrypt-auto-source/letsencrypt-auto @@ -562,7 +562,7 @@ BootstrapMac() { if ! hash virtualenv 2>/dev/null; then say "virtualenv not installed." say "Installing with pip..." - pip install virtualenv + pip install --disable-pip-version-check virtualenv fi } @@ -1045,9 +1045,9 @@ UNLIKELY_EOF PATH="$VENV_BIN:$PATH" "$VENV_BIN/python" "$TEMP_DIR/pipstrap.py" set +e if [ "$VERBOSE" = 1 ]; then - "$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" + "$VENV_BIN/pip" install --disable-pip-version-check --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" else - PIP_OUT=`"$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1` + PIP_OUT=`"$VENV_BIN/pip" install --disable-pip-version-check --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1` fi PIP_STATUS=$? set -e diff --git a/letsencrypt-auto-source/letsencrypt-auto.template b/letsencrypt-auto-source/letsencrypt-auto.template index 305435a9b..459b020cf 100755 --- a/letsencrypt-auto-source/letsencrypt-auto.template +++ b/letsencrypt-auto-source/letsencrypt-auto.template @@ -330,9 +330,9 @@ UNLIKELY_EOF PATH="$VENV_BIN:$PATH" "$VENV_BIN/python" "$TEMP_DIR/pipstrap.py" set +e if [ "$VERBOSE" = 1 ]; then - "$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" + "$VENV_BIN/pip" install --disable-pip-version-check --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" else - PIP_OUT=`"$VENV_BIN/pip" install --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1` + PIP_OUT=`"$VENV_BIN/pip" install --disable-pip-version-check --no-cache-dir --require-hashes -r "$TEMP_DIR/letsencrypt-auto-requirements.txt" 2>&1` fi PIP_STATUS=$? set -e diff --git a/letsencrypt-auto-source/pieces/bootstrappers/mac.sh b/letsencrypt-auto-source/pieces/bootstrappers/mac.sh index b88e96999..4a7e37c66 100755 --- a/letsencrypt-auto-source/pieces/bootstrappers/mac.sh +++ b/letsencrypt-auto-source/pieces/bootstrappers/mac.sh @@ -39,6 +39,6 @@ BootstrapMac() { if ! hash virtualenv 2>/dev/null; then say "virtualenv not installed." say "Installing with pip..." - pip install virtualenv + pip install --disable-pip-version-check virtualenv fi } From 9878f15966da322708eff8fd93f17dec54ab7e5f Mon Sep 17 00:00:00 2001 From: Noah Swartz Date: Wed, 19 Jul 2017 11:55:53 -0700 Subject: [PATCH 3/3] leave macos unchanged --- letsencrypt-auto-source/letsencrypt-auto | 2 +- letsencrypt-auto-source/pieces/bootstrappers/mac.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto index 17ee1d509..077847e8f 100755 --- a/letsencrypt-auto-source/letsencrypt-auto +++ b/letsencrypt-auto-source/letsencrypt-auto @@ -562,7 +562,7 @@ BootstrapMac() { if ! hash virtualenv 2>/dev/null; then say "virtualenv not installed." say "Installing with pip..." - pip install --disable-pip-version-check virtualenv + pip install virtualenv fi } diff --git a/letsencrypt-auto-source/pieces/bootstrappers/mac.sh b/letsencrypt-auto-source/pieces/bootstrappers/mac.sh index 4a7e37c66..b88e96999 100755 --- a/letsencrypt-auto-source/pieces/bootstrappers/mac.sh +++ b/letsencrypt-auto-source/pieces/bootstrappers/mac.sh @@ -39,6 +39,6 @@ BootstrapMac() { if ! hash virtualenv 2>/dev/null; then say "virtualenv not installed." say "Installing with pip..." - pip install --disable-pip-version-check virtualenv + pip install virtualenv fi }