From 23b4bcf6c5773f1499e89b132e87e4d0333676a7 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 12 Mar 2018 14:51:29 +0200 Subject: [PATCH] Provisioning: Move http_proxy.txt under shared folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id5b2f07a92eadfb21fbfdb3fb65621d6322dc8c4 Reviewed-by: Tony Sarajärvi Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/{ => shared}/http_proxy.txt | 0 coin/provisioning/common/unix/check_and_set_proxy.sh | 2 +- coin/provisioning/common/windows/set-proxy.ps1 | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename coin/provisioning/common/{ => shared}/http_proxy.txt (100%) diff --git a/coin/provisioning/common/http_proxy.txt b/coin/provisioning/common/shared/http_proxy.txt similarity index 100% rename from coin/provisioning/common/http_proxy.txt rename to coin/provisioning/common/shared/http_proxy.txt diff --git a/coin/provisioning/common/unix/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh index 38905d56..c39c7d4b 100755 --- a/coin/provisioning/common/unix/check_and_set_proxy.sh +++ b/coin/provisioning/common/unix/check_and_set_proxy.sh @@ -33,7 +33,7 @@ ############################################################################# source "${BASH_SOURCE%/*}/try_catch.sh" -source "${BASH_SOURCE%/*}/../http_proxy.txt" +source "${BASH_SOURCE%/*}/../shared/http_proxy.txt" try ( diff --git a/coin/provisioning/common/windows/set-proxy.ps1 b/coin/provisioning/common/windows/set-proxy.ps1 index 2b985b09..23c0e6aa 100644 --- a/coin/provisioning/common/windows/set-proxy.ps1 +++ b/coin/provisioning/common/windows/set-proxy.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -$n = Get-Content "$PSScriptRoot\..\http_proxy.txt" +$n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1]