--- hsh-run.fix	2006-02-17 15:37:33 +0300
+++ hsh-run.fix	2006-02-17 15:45:36 +0300
@@ -50,6 +50,7 @@ Options:
   --rooter                  run program as pseudoroot;
   --save-fakeroot           save fakeroot state;
   --shell                   run interactive shell;
+  --shell-prog=SHELL        use SHELL as shell.
   --x11-timeout=SECONDS     how long X11 authorization will be valid;
   -x                        disable X11 forwarding;
   -X                        enable X11 forwarding;
@@ -65,13 +66,14 @@ EOF
 	exit
 }
 
-TEMP=`getopt -n $PROG -o x,X,Y,h,q,v,V -l builder,execute:,hasher-priv-dir:,mountpoints:,number:,pty,rooter,save-fakeroot,shell,x11-timeout:,help,quiet,verbose,version -- "$@"` ||
+TEMP=`getopt -n $PROG -o x,X,Y,h,q,v,V -l builder,execute:,hasher-priv-dir:,mountpoints:,number:,pty,rooter,save-fakeroot,shell,x11-timeout:,help,quiet,verbose,version,shell-prog: -- "$@"` ||
 	show_usage
 eval set -- "$TEMP"
 
 run_as_rooter=
 run_script=
 run_shell=
+shell_prog="bash"
 
 if [ "${0##*/}" = hsh-shell ]; then
 	run_shell=1
@@ -105,6 +107,9 @@ while :; do
 			;;
 		--shell) run_shell=1; use_pty=yes; export use_pty
 			;;
+		--shell-prog) shift; 
+			[ -z "$1" ] || shell_prog="$1"
+			;;
 		--x11-timeout) shift; x11_timeout="$1"
 			;;
 		-x) x11_forwarding=
@@ -133,7 +138,7 @@ fi
 
 if [ -n "$run_shell" ]; then
 	[ "$#" -eq 0 ] || show_usage 'Too many arguments.'
-	set -- -a -bash bash
+	set -- -a -"$shell_prog" "$shell_prog"
 fi
 
 # Either --execute or one more argument, please.