From 7b15e02becda271641ebc002955c30dab025d708 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Thu, 6 Oct 2022 12:49:48 +0200 Subject: [PATCH] Use HTTPS proxy (not http proxy) for git pull --- lib/update-bridgehead.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/update-bridgehead.sh b/lib/update-bridgehead.sh index 19dd8e7..ef07590 100755 --- a/lib/update-bridgehead.sh +++ b/lib/update-bridgehead.sh @@ -33,8 +33,8 @@ for DIR in /etc/bridgehead $(pwd); do git -C $DIR pull 2>&1 else log "INFO" "Git is using proxy ${HTTP_PROXY_URL} from ${CONFFILE}" - git -c http.proxy=$HTTP_PROXY_URL -c http.proxy=$HTTP_PROXY_URL -C $DIR fetch 2>&1 - git -c http.proxy=$HTTP_PROXY_URL -c http.proxy=$HTTP_PROXY_URL -C $DIR pull 2>&1 + git -c http.proxy=$HTTP_PROXY_URL -c https.proxy=$HTTPS_PROXY_URL -C $DIR fetch 2>&1 + git -c http.proxy=$HTTP_PROXY_URL -c https.proxy=$HTTPS_PROXY_URL -C $DIR pull 2>&1 fi new_git_hash="$(git -C $DIR rev-parse --verify HEAD)" git_updated="false"