From 923c396db61f923c1817917d859241ea61b169e7 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Tue, 8 Aug 2023 16:06:04 -0400 Subject: [PATCH] Latest --- .../universal/run_before_01-disconnect-warp.sh.tmpl | 2 +- home/dot_local/bin/executable_provision.tmpl | 7 ------- local/provision.sh | 7 ------- scripts/provision.sh | 7 ------- scripts/src/provision.sh.tmpl | 7 ------- 5 files changed, 1 insertion(+), 29 deletions(-) diff --git a/home/.chezmoiscripts/universal/run_before_01-disconnect-warp.sh.tmpl b/home/.chezmoiscripts/universal/run_before_01-disconnect-warp.sh.tmpl index f45fa965..57e88bd8 100644 --- a/home/.chezmoiscripts/universal/run_before_01-disconnect-warp.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_before_01-disconnect-warp.sh.tmpl @@ -13,7 +13,7 @@ if command -v warp-cli > /dev/null; then if warp-cli status | grep 'Connected' > /dev/null; then logg info 'Disconnecting from CloudFlare Teams / WARP due to Volta ignoring CA specified in NPM configuration' - warp-cli disconnect + # warp-cli disconnect fi fi diff --git a/home/dot_local/bin/executable_provision.tmpl b/home/dot_local/bin/executable_provision.tmpl index 1acf84dd..27baf86c 100644 --- a/home/dot_local/bin/executable_provision.tmpl +++ b/home/dot_local/bin/executable_provision.tmpl @@ -25,13 +25,6 @@ if [ -n "$CI" ]; then export WORK_ENVIRONMENT=false fi -### Disconnect from WARP, if connected -if command -v warp-cli > /dev/null; then - if warp-cli status | grep 'Connected' > /dev/null; then - warp-cli disconnect && echo "Disconnected WARP to prevent conflicts" - fi -fi - # @description Detect `START_REPO` format and determine appropriate git address, otherwise use the master Install Doctor branch if [ -z "$START_REPO" ]; then START_REPO="https://github.com/megabyte-labs/install.doctor.git" diff --git a/local/provision.sh b/local/provision.sh index f9f6c628..235b9f23 100644 --- a/local/provision.sh +++ b/local/provision.sh @@ -13,13 +13,6 @@ if [ ! -d "${XDG_DATA_HOME:-$HOME/.local/share}/megabyte-labs" ]; then mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/megabyte-labs" fi -### Disconnect from WARP, if connected -if command -v warp-cli > /dev/null; then - if warp-cli status | grep 'Connected' > /dev/null; then - warp-cli disconnect && echo "Disconnected WARP to prevent conflicts" - fi -fi - # @description Installs glow (a markdown renderer) from GitHub releases # @example installGlow installGlow() { diff --git a/scripts/provision.sh b/scripts/provision.sh index d05f4ada..06fba03f 100644 --- a/scripts/provision.sh +++ b/scripts/provision.sh @@ -67,13 +67,6 @@ if [ -n "$CI" ]; then export WORK_ENVIRONMENT=false fi -### Disconnect from WARP, if connected -if command -v warp-cli > /dev/null; then - if warp-cli status | grep 'Connected' > /dev/null; then - warp-cli disconnect && echo "Disconnected WARP to prevent conflicts" - fi -fi - # @description Detect `START_REPO` format and determine appropriate git address, otherwise use the master Install Doctor branch if [ -z "$START_REPO" ]; then START_REPO="https://github.com/megabyte-labs/install.doctor.git" diff --git a/scripts/src/provision.sh.tmpl b/scripts/src/provision.sh.tmpl index b2470bcc..86831a97 100644 --- a/scripts/src/provision.sh.tmpl +++ b/scripts/src/provision.sh.tmpl @@ -67,13 +67,6 @@ if [ -n "$CI" ]; then export WORK_ENVIRONMENT=false fi -# @description Disconnect from WARP, if connected -if command -v warp-cli > /dev/null; then - if warp-cli status | grep 'Connected' > /dev/null; then - warp-cli disconnect && echo "Disconnected WARP to prevent conflicts" - fi -fi - # @description Detect `START_REPO` format and determine appropriate git address, otherwise use the master Install Doctor branch if [ -z "$START_REPO" ] && [ -z "$REPO" ]; then START_REPO="https://github.com/megabyte-labs/install.doctor.git"