mirror of
				https://github.com/samply/bridgehead.git
				synced 2025-11-04 02:30:17 +01:00 
			
		
		
		
	Merge pull request #132 from samply/fix/proxy-git-update
git requires http proxy config even vor https connections
This commit is contained in:
		@@ -55,7 +55,7 @@ for DIR in /etc/bridgehead $(pwd); do
 | 
			
		||||
    OUT=$(retry 5 git -C $DIR fetch 2>&1 && retry 5 git -C $DIR pull 2>&1)
 | 
			
		||||
  else
 | 
			
		||||
    log "INFO" "Git is using proxy ${HTTPS_PROXY_URL} from ${CONFFILE}"
 | 
			
		||||
    OUT=$(retry 5 git -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR fetch 2>&1 && retry 5 git -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR pull 2>&1)
 | 
			
		||||
    OUT=$(retry 5 git -c http.proxy=$HTTPS_PROXY_FULL_URL -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR fetch 2>&1 && retry 5 git -c http.proxy=$HTTPS_PROXY_FULL_URL -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR pull 2>&1)
 | 
			
		||||
  fi
 | 
			
		||||
  if [ $? -ne 0 ]; then
 | 
			
		||||
    report_error log "Unable to update git $DIR: $OUT"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user