From 4124f35044b810719c6aae8d3ca148f927482e46 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Sun, 16 Apr 2017 02:18:51 +0300
Subject: bugfix & code style

---
 %HOME%/.bash_utils/cxx.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to '%HOME%/.bash_utils/cxx.sh')

diff --git a/%HOME%/.bash_utils/cxx.sh b/%HOME%/.bash_utils/cxx.sh
index 4e332e7..633e154 100644
--- a/%HOME%/.bash_utils/cxx.sh
+++ b/%HOME%/.bash_utils/cxx.sh
@@ -25,12 +25,15 @@ runcxx_compiler=g++
 _runc_usage() (
     set -o errexit -o nounset -o pipefail
 
+    local prefix="${FUNCNAME[0]}"
+    [ "${#FUNCNAME[@]}" -gt 1 ] && prefix="${FUNCNAME[1]}"
+
     local msg
     for msg; do
-        echo "${FUNCNAME[1]}: $msg"
+        echo "$prefix: $msg"
     done
 
-    echo "usage: ${FUNCNAME[1]} [-h|--help] [-c|--comp-arg ARG]... C_PATH... [-- [PROG_ARG]...]"
+    echo "usage: $prefix [-h|--help] [-c|--comp-arg ARG]... C_PATH... [-- [PROG_ARG]...]"
 )
 
 runc() (
@@ -103,12 +106,15 @@ runc() (
 _runcxx_usage() (
     set -o errexit -o nounset -o pipefail
 
+    local prefix="${FUNCNAME[0]}"
+    [ "${#FUNCNAME[@]}" -gt 1 ] && prefix="${FUNCNAME[1]}"
+
     local msg
     for msg; do
-        echo "${FUNCNAME[1]}: $msg"
+        echo "$prefix: $msg"
     done
 
-    echo "usage: ${FUNCNAME[1]} [-h|--help] [-c|--comp-arg ARG]... CPP_PATH... [-- [PROG_ARG]...]"
+    echo "usage: $prefix [-h|--help] [-c|--comp-arg ARG]... CPP_PATH... [-- [PROG_ARG]...]"
 )
 
 runcxx() (
-- 
cgit v1.2.3