Commit 676f4b74 authored by Viktor Szakats's avatar Viktor Szakats
Browse files

maketgz: delete .bak files, fix indentation 

Ref: https://github.com/curl/curl/pull/2660

Closes https://github.com/curl/curl/pull/2662
parent 99ae23c2

maketgz

+27 −25
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -78,19 +78,23 @@ fi 
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

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!
@@ -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