From 743770fb87bf6ed74488728208c0a411a0063e7d Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sun, 31 May 2020 23:06:15 +0200
Subject: [PATCH] Misc issues in shell scripts (codefator.io).

---
 .../s4u-mc-bugged1-liveness-stack-cleaner                   | 2 +-
 tools/generate-dwarf-functions                              | 4 ++--
 tools/internal/check_dist_archive                           | 2 +-
 tools/internal/update_copyright_header                      | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner b/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner
index cb32fc81a8..ce56584b54 100755
--- a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner
+++ b/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner
@@ -14,7 +14,7 @@ die() {
 
 assert() {
   if ! eval "$1"; then
-    die "Assertion failed: $@"
+    die "Assertion failed: $*"
   fi
 }
 
diff --git a/tools/generate-dwarf-functions b/tools/generate-dwarf-functions
index 301c2b5492..959ba55df6 100755
--- a/tools/generate-dwarf-functions
+++ b/tools/generate-dwarf-functions
@@ -22,7 +22,7 @@ $HEADER
 namespace {
 const std::unordered_map<int, const char*> tagname_map = {
     {0x00, "DW_TAG_invalid"},
-$(cat "$1" | grep DW_TAG_ | sed 's/.*\(DW_TAG_[^ ]*\) = \(0x[0-9a-f]*\).*/    {\2, "\1"},/')
+$(grep DW_TAG_ -- "$1" | sed 's/.*\(DW_TAG_[^ ]*\) = \(0x[0-9a-f]*\).*/    {\2, "\1"},/')
 };
 }
 
@@ -50,7 +50,7 @@ $HEADER
 
 namespace {
 const std::unordered_map<int, const char*> attrname_map = {
-$(cat "$1" | grep DW_AT_ | sed 's/.*\(DW_AT_[^ ]*\) = \(0x[0-9a-f]*\).*/    {\2, "\1"},/')
+$(grep DW_AT_ -- "$1" | sed 's/.*\(DW_AT_[^ ]*\) = \(0x[0-9a-f]*\).*/    {\2, "\1"},/')
 };
 }
 
diff --git a/tools/internal/check_dist_archive b/tools/internal/check_dist_archive
index 2b7247a10b..34da5e442d 100755
--- a/tools/internal/check_dist_archive
+++ b/tools/internal/check_dist_archive
@@ -17,7 +17,7 @@ else
     interactive=0
 fi
 
-if [ $# -lt 1 -o $# -gt 3 ]; then
+if [ $# -lt 1 ] || [ $# -gt 3 ]; then
     cat >&2 <<EOF
 Usage: $0 [-batch] archive.tar.gz [git_url [git_reference]]
 EOF
diff --git a/tools/internal/update_copyright_header b/tools/internal/update_copyright_header
index 6cccb337cc..eb1e9fe6bd 100755
--- a/tools/internal/update_copyright_header
+++ b/tools/internal/update_copyright_header
@@ -35,7 +35,7 @@ get_dates() {
               s/[, ]\+/\n/g
               p
             }' "$file" \
-    | while read date; do
+    | while read -r date; do
         case "$date" in
             "")
                 ;;
@@ -54,9 +54,9 @@ format_dates() {
     local first
     local last
     local next
-    read first
+    read -r first
     last=$first
-    while read next; do
+    while read -r next; do
         if [ $next -eq $((last + 1)) ]; then
             last=$next
         else
-- 
2.20.1