--- /usr/bin/chere	2014-02-21 08:00:09.000000000 +0900
+++ chere	2016-07-17 10:55:31.839227500 +0900
@@ -202,7 +202,7 @@
 {
  # Check windows version and cygwin install directory
  VER=`uname -s`
- ID_USER=`id -nu`
+ ID_USER=`id -u`
  RUN_EXE=""
  ASH_EXE=`cygpath -w /bin/sh`
  BASH_EXE=`cygpath -w /bin/bash`
@@ -477,7 +477,7 @@
 	CPH_DESC="Command Prompt Here (cygwin)";;
   passwd )
 	# Experimental
-	SHELL_EXE="/bin/sh"
+	SHELL_EXE="/bin/bash"
 	# Quoting nightmare. Step through it all
 	# c:\cygwin\bin\sh -c "scmd=`getent passwd \`id -un\` | sed -n \"s?.*:\\\(.*\\\)?\\\1?gp\"`; $scmd -l -c \"cd \\\"c:/program files\\\"; exec $scmd\""
 	# works from the command line
@@ -488,8 +488,9 @@
 	# When evaluated into a variable, need another level of quoting:
 	# "c:\cygwin\bin\sh -c \\\"scmd=\\\`getent passwd \\\\\\\`id -un\\\\\\\` | sed -n \\\\\\\"s?.*:\\\\\\\\\\\\(.*\\\\\\\\\\\\)?\\\\\\\\\\\\1?gp\\\\\\\"\\\`; \\\$scmd -l -c \\\\\\\"cd \\\\\\\\\\\\\\\"%L\\\\\\\\\\\\\\\"; exec \\\$scmd\\\\\\\"\\\""
 	# Ouch. If you think it can be quoted better, let me know.
-	SHELL_CMD="-c \\\"scmd=\\\`getent passwd \\\\\\\`id -un\\\\\\\` | sed -n \\\\\\\"s?.*:\\\\\\\\\\\\(.*\\\\\\\\\\\\)?\\\\\\\\\\\\1?gp\\\\\\\"\\\`; \\\$scmd -l -c \\\\\\\"cd \\\\\\\\\\\\\\\"%L\\\\\\\\\\\\\\\"; exec \\\$scmd\\\\\\\"\\\""
-	ACCEL="Shell Prompt &Here"
+	SHELL_CMD='-c \"scmd=\`/bin/getent passwd \\\`/bin/id -u\\\` | /bin/sed -n '\''s?.*:\\\(.*\\\)?\\\1?gp'\''\`; case \$scmd in *csh*) ;; *) dmy=-\$scmd;; esac; exec -l \$scmd -c '\''cd \\\"\$1\\\"; exec \$2'\'' \$dmy \\\"\$0\\\" \$scmd\" \"%L\"'
+
+	ACCEL="&Cygwin Prompt Here"
 	CPH_DESC="Cygwin Prompt Here"
 
 	# Extra check before installing passwd
@@ -760,6 +761,7 @@
   $REGTOOL -s set $1/ \"$3\"
   $REGTOOL add $1/command
   $REGTOOL -e set $1/command/ \"$4\"
+  # $REGTOOL -s set $1/Extended \"\"
  else
   echo $0 Warning: Not overriding existing entry
   echo