[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 83/153: projects: Improve Windows perl detection in
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 83/153: projects: Improve Windows perl detection in batch scripts |
Date: |
Tue, 11 Sep 2018 12:52:34 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 220cd241cd8e64c5968df91c6f0a8083b49869ee
Author: Jay Satiro <address@hidden>
AuthorDate: Sat Aug 11 16:33:12 2018 -0400
projects: Improve Windows perl detection in batch scripts
- Determine if perl is in the user's PATH by running perl.exe.
Prior to this change detection was done by checking the PATH for perl/
but that did not work in all cases (eg git install includes perl but
not in perl/ path).
Bug: https://github.com/curl/curl/pull/2865
Reported-by: Daniel JeliĆski
---
projects/build-openssl.bat | 33 ++++++++++++++-------------------
projects/checksrc.bat | 2 +-
2 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat
index 9fd49b780..98daff529 100644
--- a/projects/build-openssl.bat
+++ b/projects/build-openssl.bat
@@ -153,26 +153,21 @@ rem
***************************************************************************
rem Check we have Visual Studio installed
if not exist "%ABS_VC_PATH%" goto novc
-
if not defined PERL_PATH (
- rem Check we have Perl in our path
- rem using !! below as %% was having \Microsoft was unexpected error.
- echo !PATH! | findstr /I /C:"\Perl" 1>nul
- if errorlevel 1 (
- rem It isn't so check we have it installed and set the path if
it is
- if exist "%SystemDrive%\Perl" (
- set "PATH=%SystemDrive%\Perl\bin;%PATH%"
- ) else (
- if exist "%SystemDrive%\Perl64" (
- set "PATH=%SystemDrive%\Perl64\bin;%PATH%"
- ) else (
-
-
-
- goto noperl
- )
- )
- )
+ rem Check we have Perl in our path
+ perl --version <NUL 1>NUL 2>&1
+ if errorlevel 1 (
+ rem It isn't so check we have it installed and set the path if it is
+ if exist "%SystemDrive%\Perl" (
+ set "PATH=%SystemDrive%\Perl\bin;%PATH%"
+ ) else (
+ if exist "%SystemDrive%\Perl64" (
+ set "PATH=%SystemDrive%\Perl64\bin;%PATH%"
+ ) else (
+ goto noperl
+ )
+ )
+ )
) else (
set "PATH=%PERL_PATH%\Perl\bin;%PATH%"
)
diff --git a/projects/checksrc.bat b/projects/checksrc.bat
index 3c38f50e6..5c8debf11 100644
--- a/projects/checksrc.bat
+++ b/projects/checksrc.bat
@@ -73,7 +73,7 @@ rem
***************************************************************************
:prerequisites
rem Check we have Perl in our path
- echo %PATH% | findstr /I /C:"\Perl" 1>nul
+ perl --version <NUL 1>NUL 2>&1
if errorlevel 1 (
rem It isn't so check we have it installed and set the path if it is
if exist "%SystemDrive%\Perl" (
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 94/153: RELEASE-NOTES: synced, (continued)
- [GNUnet-SVN] [gnurl] 94/153: RELEASE-NOTES: synced, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 87/153: http: fix for tiny "HTTP/0.9" response, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 88/153: travis: update to GCC 8, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 80/153: Silence GCC 8 cast-function-type warnings, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 84/153: Split non-portable part off test 1133, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 63/153: RELEASE-NOTES: synced, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 85/153: .travis.yml: verify that man pages can be regenerated, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 79/153: CURLINFO_SIZE_UPLOAD: fix missing counter update, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 61/153: windows: implement send buffer tuning, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 77/153: RELEASE-NOTES: synced, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 83/153: projects: Improve Windows perl detection in batch scripts,
gnunet <=
- [GNUnet-SVN] [gnurl] 78/153: Documentation: fix CURLOPT_SSH_COMPRESSION copy/paste bug, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 55/153: DEPRECATE: remove release date from 7.62.0, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 82/153: docs: Improve the manual pages of some callbacks, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 81/153: GCC: silence -Wcast-function-type uniformly, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 52/153: test1307: disabled, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 76/153: openssl: fix potential NULL pointer deref in is_pkcs11_uri, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 67/153: formdata: Remove unused macro HTTPPOST_CONTENTTYPE_DEFAULT, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 49/153: RELEASE-NOTES: synced, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 50/153: general: fix printf specifiers, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 60/153: ssl: set engine implicitly when a PKCS#11 URI is provided, gnunet, 2018/09/11