Compare commits
2 Commits
41198b3222
...
f6544ecb13
Author | SHA1 | Date |
---|---|---|
|
f6544ecb13 | |
|
f793ab6952 |
|
@ -21,6 +21,17 @@
|
||||||
:: SOFTWARE.
|
:: SOFTWARE.
|
||||||
|
|
||||||
@echo off
|
@echo off
|
||||||
set HTTP_PROXY=http://127.0.0.1:4780
|
for /f "tokens=1,2,*" %%i in ('reg query "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyEnable') do set __proxy_enable=%%k
|
||||||
set HTTPS_PROXY=http://127.0.0.1:4780
|
for /f "tokens=1,2,*" %%i in ('reg query "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyServer') do set __proxy_server=%%k
|
||||||
set ALL_PROXY=http://127.0.0.1:4780
|
if /i "%__proxy_enable%" == "0x1" (
|
||||||
|
set HTTP_PROXY=http://%__proxy_server%
|
||||||
|
set HTTPS_PROXY=http://%__proxy_server%
|
||||||
|
set ALL_PROXY=http://%__proxy_server%
|
||||||
|
) else (
|
||||||
|
set HTTP_PROXY=
|
||||||
|
set HTTPS_PROXY=
|
||||||
|
set ALL_PROXY=
|
||||||
|
)
|
||||||
|
echo HTTP_PROXY=%HTTP_PROXY%
|
||||||
|
echo HTTPS_PROXY=%HTTPS_PROXY%
|
||||||
|
echo ALL_PROXY=%ALL_PROXY%
|
||||||
|
|
|
@ -20,6 +20,17 @@
|
||||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
# SOFTWARE.
|
# SOFTWARE.
|
||||||
|
|
||||||
$env:HTTP_PROXY="http://127.0.0.1:4780"
|
$__proxy_enable = Get-ItemPropertyValue "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" "ProxyEnable"
|
||||||
$env:HTTPS_PROXY="http://127.0.0.1:4780"
|
$__proxy_server = Get-ItemPropertyValue "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" "ProxyServer"
|
||||||
$env:ALL_PROXY="http://127.0.0.1:4780"
|
if ($__proxy_enable -eq 1) {
|
||||||
|
$env:HTTP_PROXY="http://$__proxy_server"
|
||||||
|
$env:HTTPS_PROXY="http://$__proxy_server"
|
||||||
|
$env:ALL_PROXY="http://$__proxy_server"
|
||||||
|
} else {
|
||||||
|
$env:HTTP_PROXY=""
|
||||||
|
$env:HTTPS_PROXY=""
|
||||||
|
$env:ALL_PROXY=""
|
||||||
|
}
|
||||||
|
Write-Host "HTTP_PROXY:" $env:HTTP_PROXY
|
||||||
|
Write-Host "HTTPS_PROXY:" $env:HTTPS_PROXY
|
||||||
|
Write-Host "ALL_PROXY:" $env:ALL_PROXY
|
||||||
|
|
|
@ -2119,7 +2119,7 @@ function(query_git_information)
|
||||||
if(arg_AUTHOR)
|
if(arg_AUTHOR)
|
||||||
set(__author "")
|
set(__author "")
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND "${GIT_EXECUTABLE}" log -1 --pretty=format:"%aN (%aE)"
|
COMMAND "${GIT_EXECUTABLE}" log -1 "--pretty=format:%aN (%aE)"
|
||||||
OUTPUT_VARIABLE __author
|
OUTPUT_VARIABLE __author
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
ERROR_QUIET
|
ERROR_QUIET
|
||||||
|
|
Loading…
Reference in New Issue