From 6fc8e6b82a4e06b603290a83e3bed05f323465d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= <mislav.marohnic@gmail.com>
Date: Tue, 8 Jan 2013 00:16:05 +0100
Subject: [PATCH] don't burden zsh with "_sub_wrapper" hack for bash

Also, possibly enables again the wrapper function for shells other than
bash/zsh.
---
 libexec/sub-init | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/libexec/sub-init b/libexec/sub-init
index c783f28..974677d 100755
--- a/libexec/sub-init
+++ b/libexec/sub-init
@@ -63,10 +63,14 @@ bash | zsh )
   ;;
 esac
 
+wrapper_function=
+# hack for bash where numbers are not valid function name
+[ "$shell" = "bash" ] && wrapper_function=_sub_wrapper
+
 commands=(`sub commands --sh`)
 IFS="|"
 cat <<EOS
-_sub_wrapper() {
+${wrapper_function:-sub}() {
   local command="\$1"
   if [ "\$#" -gt 0 ]; then
     shift
@@ -81,14 +85,5 @@ _sub_wrapper() {
 }
 EOS
 
-# zsh can't pass argument with aliases, but bash can.
-# zsh can have functions with the name being only numbers, but bash can't.
-# fix both cases here by letting zsh have a function, and bash have its alias.
-case "$shell" in
-bash )
-  echo "alias sub=_sub_wrapper"
-  ;;
-zsh )
-  echo "sub=_sub_wrapper"
-  ;;
-esac
+# related to the bash hack above
+[ -n "$wrapper_function" ] && echo "alias sub=${wrapper_function}"