[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 96/163: maketgz: fix sed issues on OSX
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 96/163: maketgz: fix sed issues on OSX |
Date: |
Sun, 05 Aug 2018 12:37:02 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit cf448436facd28da1bafe031d14a8bc4f165ddaa
Author: Mamta Upadhyay <address@hidden>
AuthorDate: Thu Jun 14 09:29:43 2018 -0700
maketgz: fix sed issues on OSX
maketgz creates release tarballs and removes the -DEV string in curl
version (e.g. 7.58.0-DEV), else -DEV shows up on command line when curl
is run. maketgz works fine on linux but fails on OSX. Problem is with
the sed commands that use option -i without an extension. Maketgz
expects GNU sed instead of BSD and this simply won't work on OSX. Adding
a backup extension .bak after -i fixes this issue
Running the script as if on OSX gives this error:
sed: -e: No such file or directory
Adding a .bak extension resolves it
Closes #2660
---
maketgz | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/maketgz b/maketgz
index b740173db..8fe8d8e92 100755
--- a/maketgz
+++ b/maketgz
@@ -78,7 +78,7 @@ fi
datestamp=`date +"%F"`
# Replace version number in header file:
-sed -i -e 's/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION
"'$libversion'"/g' \
+sed -i.bak -e 's/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION
"'$libversion'"/g' \
-e 's/^#define LIBCURL_VERSION_NUM .*/#define LIBCURL_VERSION_NUM
0x'$numeric'/g' \
-e 's/^#define LIBCURL_VERSION_MAJOR .*/#define LIBCURL_VERSION_MAJOR
'$major'/g' \
-e 's/^#define LIBCURL_VERSION_MINOR .*/#define LIBCURL_VERSION_MINOR
'$minor'/g' \
@@ -87,10 +87,10 @@ sed -i -e 's/^#define LIBCURL_VERSION .*/#define
LIBCURL_VERSION "'$libversion'"
$HEADER
# Replace version number in header file:
-sed -i 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g'
$CHEADER
+sed -i.bak 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g'
$CHEADER
# Replace version number in plist file:
-sed -i "s/7\.12\.3/$libversion/g" $PLIST
+sed -i.bak "s/7\.12\.3/$libversion/g" $PLIST
if test -n "$only"; then
# done!
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 52/163: os400: implement mime api EBCDIC wrappers, (continued)
- [GNUnet-SVN] [gnurl] 52/163: os400: implement mime api EBCDIC wrappers, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 110/163: ConnectionExists: make sure conn->data is set when "taking" a connection, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 104/163: multi: fix memory leak when stopped during name resolve, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 83/163: schannel: support selecting ciphers, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 68/163: build: remove the Borland specific makefiles, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 45/163: psl: use latest psl and refresh it periodically, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 71/163: spelling fixes, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 64/163: fnmatch: use the system one if available, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 90/163: mk-ca-bundle.pl: make -u delete certdata.txt if found not changed, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 142/163: KNOWN_BUGS: Stick to same family over SOCKS proxy, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 96/163: maketgz: fix sed issues on OSX,
gnunet <=
- [GNUnet-SVN] [gnurl] 140/163: libssh: include line number in state change debug messages, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 106/163: CURLOPT_INTERFACE.3: interface names not supported on Windows, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 122/163: getnameinfo: not used, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 100/163: docs/RELEASE-PROCEDURE.md: renamed to use .md extension, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 111/163: multi: fix crash due to dangling entry in connect-pending list, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 116/163: include/README: remove "hacking" advice, not the right place, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 118/163: GOVERNANCE: add maintainer details/duties, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 113/163: netrc: use a larger buffer, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 103/163: maketgz: delete .bak files, fix indentation, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 97/163: CURLOPT_HTTPAUTH.3: CURLAUTH_BEARER was added in 7.61.0, gnunet, 2018/08/05