Merge tag 'curl-7_56_0'

curl 7.56.0

4 files changed, 6 insertions, 5 deletions

diff --git a/scripts/contributors.sh b/scripts/contributors.sh
index fcaaff878..db7aab8e0 100755
--- a/scripts/contributors.sh
+++ b/scripts/contributors.sh
@@ -44,7 +44,7 @@ fi
 # sort all unique names
 # awk them into RELEASE-NOTES format
 (
-git log $start..HEAD | \
+git log --use-mailmap $start..HEAD | \
 egrep -ai '(^Author|^Commit|by):' | \
 cut -d: -f2- | \
 cut '-d(' -f1 | \
diff --git a/scripts/contrithanks.sh b/scripts/contrithanks.sh
index 4d6d47a80..d3dad3e90 100755
--- a/scripts/contrithanks.sh
+++ b/scripts/contrithanks.sh
@@ -35,7 +35,7 @@ fi
 cat ./docs/THANKS
 
 (
-git log $start..HEAD | \
+git log --use-mailmap $start..HEAD | \
 egrep -ai '(^Author|^Commit|by):' | \
 cut -d: -f2- | \
 cut '-d(' -f1 | \
diff --git a/scripts/updatemanpages.pl b/scripts/updatemanpages.pl
index e144bad11..6a58dbd42 100755
--- a/scripts/updatemanpages.pl
+++ b/scripts/updatemanpages.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/scripts/zsh.pl b/scripts/zsh.pl
index 5b5ad13e7..fbafde164 100755
--- a/scripts/zsh.pl
+++ b/scripts/zsh.pl
@@ -54,10 +54,11 @@ sub parse_main_opts {
         $option .= '}' if defined $short;
         $option .= '\'[' . trim($desc) . ']\'' if defined $desc;
 
-        $option .= ":$arg" if defined $arg;
+        $option .= ":'$arg'" if defined $arg;
 
         $option .= ':_files'
-            if defined $arg and ($arg eq 'FILE' || $arg eq 'DIR');
+            if defined $arg and ($arg eq '<file>' || $arg eq '<filename>'
+                || $arg eq '<dir>');
 
         push @list, $option;
     }