Subject: [PATCH 26/28] Add _debug_func() helper function

From: Vincent Legoll <[email-masked]>
Date: Sun, 17 May 2020 19:17:23 +0200

---
 etc/guix-install.sh | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 38f61de2f7..4ee350a155 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -85,12 +85,17 @@ _debug()
     fi
 }
 
+_debug_func()
+{
+    # Display _debug_func() caller's function name
+    _debug "--- [ ${FUNCNAME[1]} ] ---"
+}
 
 chk_require()
 { # Check that every required command is available.
     declare -a warn
 
-    _debug "--- [ $FUNCNAME ] ---"
+    _debug_func
 
     for c in "$@"; do
         command -v "$c" >/dev/null 2>&1 || warn+=("$c")
@@ -105,7 +110,7 @@ chk_require()
 
 chk_gpg_keyring()
 { # Check whether the Guix release signing public key is present.
-    _debug "--- [ $FUNCNAME ] ---"
+    _debug_func
 
     # Without --dry-run this command will create a ~/.gnupg owned by root on
     # systems where gpg has never been used, causing errors and confusion.
@@ -203,7 +208,7 @@ guix_get_bin_list()
 { # Scan GNU archive and save list of binaries
     gnu_url="$1"
 
-    _debug "--- [ $FUNCNAME ] ---"
+    _debug_func
 
     # Filter only version and architecture
     bin_ver_ls=("$(wget -qO- "$gnu_url" \
@@ -233,7 +238,7 @@ guix_get_bin()
     bin_ver="$2"
     dl_path="$3"
 
-    _debug "--- [ $FUNCNAME ] ---"
+    _debug_func
 
     _msg "${INF}Downloading Guix release archive"
 
@@ -264,7 +269,7 @@ sys_create_store()
     pkg="$1"
     tmp_path="$2"
 
-    _debug "--- [ $FUNCNAME ] ---"
+    _debug_func
 
     # Do not use the --warning option with busybox tar
     TAROPTS=("-C" "${tmp_path}")
@@ -297,7 +302,7 @@ sys_create_store()
 sys_create_build_group()
 { # Create the group for build users.
 
-    _debug "--- [ $FUNCNAME ] ---"
+    _debug_func
 
     if getent group guixbuild >/dev/null 2>&1; then
         _msg "${INF}group guixbuild already exists"
@@ -316,7 +321,7 @@ sys_create_build_group()
 sys_create_build_user()
 { # Create the user accounts for build users.
 
-    _debug "--- [ $FUNCNAME ] ---"
+    _debug_func
 
     NOLOGIN_SHELL="$(command -v nologin)"
     for i in $(seq -w 1 10); do
@@ -352,7 +357,7 @@ sys_create_build_user()
 sys_enable_guix_daemon()
 { # Run the daemon, and set it to automatically start on boot.
 
-    _debug "--- [ $FUNCNAME ] ---"
+    _debug_func
 
     case "$INIT_SYS" in
         upstart)
@@ -420,7 +425,7 @@ sys_enable_guix_daemon()
 sys_make_guix_available()
 { # add guix into PATH
 
-    _debug "--- [ $FUNCNAME ] ---"
+    _debug_func
 
     info_path="/usr/local/share/info"
     local_bin="/usr/local/bin"
-- 
2.26.2