From 7118adb657e4baaa35515622057fc79a60788992 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 7 Oct 2017 14:59:46 +0200 Subject: [PATCH] subcommand: Fix some format string issues. One should never use variables in format strings. Found by shellcheck. --- subcommand | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/subcommand b/subcommand index 7da8048..34553b8 100644 --- a/subcommand +++ b/subcommand @@ -255,13 +255,13 @@ com_prefs() printf "# optional" ;; esac - printf " $option_type: $description" + printf "%s: %s" "$option_type" "$description" if [[ "$required" != "yes" && "$required" != "true" ]]; then - printf " [$default_value]" + printf " [%s]" "$default_value" fi echo [[ -n "$help_text" ]] && sed -e '/^[ ]*$/d; s/^[ ]*/# /g' <<< "$help_text" - printf "$name=$val" + printf "%s=%s" "$name" "$val" [[ "$val" == "$default_value" ]] && printf " # default" echo done @@ -360,11 +360,11 @@ com_help() gsu_short_msg "### $gsu_name -- $gsu_banner_txt ###" _gsu_usage 2>&1 { - printf "com_help()\n$_gsu_help_txt" | head -n 4; echo "--" - printf "com_man()\n$_gsu_man_txt" | head -n 4; echo "--" - printf "com_prefs()\n$_gsu_prefs_txt" | head -n 4; echo "--" - printf "com_complete()\n$_gsu_complete_txt" | head -n 4; echo "--" - grep -EA 2 "$ere" $0 + printf "com_help()\n%s" "$_gsu_help_txt" | head -n 4; echo "--" + printf "com_man()\n%s" "$_gsu_man_txt" | head -n 4; echo "--" + printf "com_prefs()\n%s" "$_gsu_prefs_txt" | head -n 4; echo "--" + printf "com_complete()\n%s" "$_gsu_complete_txt" | head -n 4; echo "--" + grep -EA 2 "$ere" "$0" } | grep -v -- '--' \ | sed -En "/$ere/"'!d # remove everything but the command name -- 2.39.5