Merge branch 't/kill_gsu_self'
authorAndre Noll <maan@tuebingen.mpg.de>
Sat, 20 Sep 2014 08:09:24 +0000 (10:09 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sat, 20 Sep 2014 08:09:24 +0000 (10:09 +0200)
Cooking for three weeks.

* t/kill_gsu_self:
  Remove $_gsu_self.

Conflicts:
subcommand

1  2 
subcommand

diff --combined subcommand
@@@ -8,7 -8,7 +8,7 @@@ f
  
  _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 +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."
          ret=$GSU_SUCCESS
  }
  
 -_gsu_banner_msg()
 -{
 -      gsu_short_msg "### $gsu_name -- ###"
 -}
 -
  export gsu_help_txt="
  Print online help.
  
@@@ -222,7 -227,7 +222,7 @@@ _com_help(
        ere="$result"
  
        if (($# == 0)); then
-               gsu_short_msg "### $_gsu_self -- $gsu_banner_txt ###"
 -              _gsu_banner_msg 2>&1
++              gsu_short_msg "### $gsu_name -- $gsu_banner_txt ###"
                _gsu_usage 2>&1
                {
                        printf "com_help()\n$gsu_help_txt" | head -n 4; echo "--"
                                # 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