From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 20 Sep 2014 08:09:24 +0000 (+0200)
Subject: Merge branch 't/kill_gsu_self'
X-Git-Url: http://git.tuebingen.mpg.de/?p=gsu.git;a=commitdiff_plain;h=1abcb66fb2213dd5ab568d0386566c8ea8640aba;hp=c6de1322bab25a884ad48300f33d7ac623074005

Merge branch 't/kill_gsu_self'

Cooking for three weeks.

	* t/kill_gsu_self:
	  Remove $_gsu_self.

Conflicts:
	subcommand
---

diff --git a/common b/common
index bd8276b..a7c39b1 100644
--- a/common
+++ b/common
@@ -49,12 +49,12 @@ gsu_short_msg()
 
 gsu_msg()
 {
-	gsu_short_msg "$_gsu_self: $1"
+	gsu_short_msg "$gsu_name: $1"
 }
 
 gsu_date_msg()
 {
-	gsu_short_msg "$_gsu_self $(date): $1"
+	gsu_short_msg "$gsu_name $(date): $1"
 }
 
 gsu_err_msg()
@@ -81,8 +81,7 @@ gsu_err_msg()
 
 _gsu_setup()
 {
-	_gsu_self="$(basename $0)"
-	gsu_name="${gsu_name:=$_gsu_self}"
+	gsu_name="${gsu_name:-${0##*/}}"
 	gsu_config_var_prefix="${gsu_config_var_prefix:=$gsu_name}"
 	gsu_banner_txt="${gsu_banner_txt:-set \$gsu_banner_txt to customize this message}"
 	_gsu_init_errors
diff --git a/subcommand b/subcommand
index 06f677b..6449d6e 100644
--- a/subcommand
+++ b/subcommand
@@ -8,7 +8,7 @@ fi
 
 _gsu_usage()
 {
-	gsu_short_msg "# Usage: $_gsu_self command [options]"
+	gsu_short_msg "# Usage: $gsu_name command [options]"
 }
 
 # Return an extended regular expression to match against $0.
@@ -160,15 +160,15 @@ _com_man()
 	local minus_signs="--------------------------------------------------"
         local com num
 
-	echo "$_gsu_self (_${gsu_banner_txt}_) manual"
-	echo "${equal_signs:0:${#_gsu_self} + ${#gsu_banner_txt} + 16}"
+	echo "$gsu_name (_${gsu_banner_txt}_) manual"
+	echo "${equal_signs:0:${#gsu_name} + ${#gsu_banner_txt} + 16}"
 	echo
 
         sed -e '1,/^#\{70,\}/d' -e '/^#\{70,\}/,$d' $0 -e 's/^# *//'
 	echo "----"
         echo
-	echo "$_gsu_self usage"
-	echo "${minus_signs:0:${#_gsu_self} + 6}"
+	echo "$gsu_name usage"
+	echo "${minus_signs:0:${#gsu_name} + 6}"
 	printf "\t"
 	_gsu_usage 2>&1
 	echo "Each command has its own set of options as described below."
@@ -222,7 +222,7 @@ _com_help()
 	ere="$result"
 
 	if (($# == 0)); then
-		gsu_short_msg "### $_gsu_self -- $gsu_banner_txt ###"
+		gsu_short_msg "### $gsu_name -- $gsu_banner_txt ###"
 		_gsu_usage 2>&1
 		{
 			printf "com_help()\n$gsu_help_txt" | head -n 4; echo "--"
@@ -252,7 +252,7 @@ _com_help()
 				# and print the sucker
 				p'
 		echo
-		echo "# Try $_gsu_self help <command> for info on <command>."
+		echo "# Try $gsu_name help <command> for info on <command>."
 		ret=$GSU_SUCCESS
 		return
 	fi