[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 103/163: maketgz: delete .bak files, fix indentatio
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 103/163: maketgz: delete .bak files, fix indentation |
Date: |
Sun, 05 Aug 2018 12:37:09 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 676f4b742df634afc862a8e2ee9bd717d7efd03d
Author: Viktor Szakats <address@hidden>
AuthorDate: Fri Jun 15 23:28:34 2018 +0000
maketgz: delete .bak files, fix indentation
Ref: https://github.com/curl/curl/pull/2660
Closes https://github.com/curl/curl/pull/2662
---
maketgz | 52 +++++++++++++++++++++++++++-------------------------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/maketgz b/maketgz
index 8fe8d8e92..55a57c1b3 100755
--- a/maketgz
+++ b/maketgz
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# Script to build release-archives with. Note that this requires a checkout
# from git and you should first run ./buildconf and build curl once.
#
@@ -9,7 +9,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
+# Copyright (C) 1998 - 2018, Daniel Stenberg, <address@hidden>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -32,8 +32,8 @@ if [ -z "$version" ]; then
fi
if [ "xonly" = "x$2" ]; then
- echo "Setup version number only!"
- only=1
+ echo "Setup version number only!"
+ only=1
fi
libversion="$version"
@@ -41,13 +41,13 @@ libversion="$version"
# we make curl the same version as libcurl
curlversion=$libversion
-major=`echo $libversion |cut -d. -f1 | sed -e "s/[^0-9]//g"`
-minor=`echo $libversion |cut -d. -f2 | sed -e "s/[^0-9]//g"`
-patch=`echo $libversion |cut -d. -f3 | cut -d- -f1 | sed -e "s/[^0-9]//g"`
+major=`echo $libversion | cut -d. -f1 | sed -e "s/[^0-9]//g"`
+minor=`echo $libversion | cut -d. -f2 | sed -e "s/[^0-9]//g"`
+patch=`echo $libversion | cut -d. -f3 | cut -d- -f1 | sed -e "s/[^0-9]//g"`
if test -z "$patch"; then
- echo "invalid version number? needs to be z.y.z"
- exit
+ echo "invalid version number? needs to be z.y.z"
+ exit
fi
#
@@ -64,37 +64,41 @@ CHEADER=src/tool_version.h
PLIST=lib/libcurl.plist
if test -z "$only"; then
- ext=".dist"
- # when not setting up version numbers locally
- for a in $HEADER $CHEADER $PLIST; do
- cp $a "$a$ext"
- done
- HEADER="$HEADER$ext"
- CHEADER="$CHEADER$ext"
- PLIST="$PLIST$ext"
+ ext=".dist"
+ # when not setting up version numbers locally
+ for a in $HEADER $CHEADER $PLIST; do
+ cp $a "$a$ext"
+ done
+ HEADER="$HEADER$ext"
+ CHEADER="$CHEADER$ext"
+ PLIST="$PLIST$ext"
fi
# requires a date command that knows + for format
datestamp=`date +"%F"`
# Replace version number in header file:
-sed -i.bak -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' \
-e 's/^#define LIBCURL_VERSION_PATCH .*/#define LIBCURL_VERSION_PATCH
'$patch'/g' \
-e "s/^#define LIBCURL_TIMESTAMP .*/#define LIBCURL_TIMESTAMP
\"$datestamp\"/g" \
- $HEADER
+ $HEADER
+rm -f "$HEADER.bak"
# Replace version number in header file:
sed -i.bak 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g'
$CHEADER
+rm -f "$CHEADER.bak"
# Replace version number in plist file:
sed -i.bak "s/7\.12\.3/$libversion/g" $PLIST
+rm -f "$PLIST.bak"
if test -n "$only"; then
- # done!
- exit;
+ # done!
+ exit;
fi
echo "curl version $curlversion"
@@ -102,8 +106,7 @@ echo "libcurl version $libversion"
echo "libcurl numerical $numeric"
echo "datestamp $datestamp"
-findprog()
-{
+findprog() {
file="$1"
for part in `echo $PATH| tr ':' ' '`; do
path="$part/$file"
@@ -189,8 +192,7 @@ gzip -dc $targz | xz -6e - > $xz
#
# Now make a zip archive from the tar.gz original
#
-makezip ()
-{
+makezip() {
rm -rf $tempdir
mkdir $tempdir
cd $tempdir
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 142/163: KNOWN_BUGS: Stick to same family over SOCKS proxy, (continued)
- [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, 2018/08/05
- [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 <=
- [GNUnet-SVN] [gnurl] 97/163: CURLOPT_HTTPAUTH.3: CURLAUTH_BEARER was added in 7.61.0, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 148/163: examples: fix -Wformat warnings, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 131/163: telnet: fix clang warnings, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 137/163: RELEASE-NOTES: synced, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 127/163: RELEASE-NOTES: synced, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 147/163: smtp: use the upload buffer size for scratch buffer malloc, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 125/163: CURLINFO_TLS_SSL_PTR.3: improve the example, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 160/163: gnurl: post-merge adjustments, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 152/163: schannel: fix -Wsign-compare warning, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 151/163: schannel: workaround for wrong function signature in w32api, gnunet, 2018/08/05