Compare commits

..

No commits in common. "f6544ecb136426f1af370463c364d1fddf79e465" and "41198b322221e1c79b025a74f511cf84e7bb3b1a" have entirely different histories.

3 changed files with 7 additions and 29 deletions

View File

@ -21,17 +21,6 @@
:: SOFTWARE.
@echo off
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
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
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%
set HTTP_PROXY=http://127.0.0.1:4780
set HTTPS_PROXY=http://127.0.0.1:4780
set ALL_PROXY=http://127.0.0.1:4780

View File

@ -20,17 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
$__proxy_enable = Get-ItemPropertyValue "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" "ProxyEnable"
$__proxy_server = Get-ItemPropertyValue "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" "ProxyServer"
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
$env:HTTP_PROXY="http://127.0.0.1:4780"
$env:HTTPS_PROXY="http://127.0.0.1:4780"
$env:ALL_PROXY="http://127.0.0.1:4780"

View File

@ -2119,7 +2119,7 @@ function(query_git_information)
if(arg_AUTHOR)
set(__author "")
execute_process(
COMMAND "${GIT_EXECUTABLE}" log -1 "--pretty=format:%aN (%aE)"
COMMAND "${GIT_EXECUTABLE}" log -1 --pretty=format:"%aN (%aE)"
OUTPUT_VARIABLE __author
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET