Merge remote-tracking branch 'cxreg/master'

CNAME

@@ -0,0 +1 @@
+smartcd.org

README.md

@@ -1,5 +1,7 @@
 # smartcd - make your shell come alive
 
+[![Join the chat at https://gitter.im/cxreg/smartcd](https://badges.gitter.im/cxreg/smartcd.svg)](https://gitter.im/cxreg/smartcd?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ## WHAT IS SMARTCD?
 
   smartcd is a library for bash and zsh which brings transformative power
@@ -87,7 +89,7 @@ These are just a few examples of problems people are solving with smartcd.
 
     echo 'autostash PATH=__PATH__/temporary/path:$PATH' | smartcd edit enter
 
-  which also highlights a convenient feature that replaces __PATH__ with the
+  which also highlights a convenient feature that replaces `__PATH__` with the
   directory name before the script is run.
 
   If you like doing things by hand, you may prefer

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

lib/core/smartcd_export

@@ -20,7 +20,8 @@ function smartcd_export() {
         # Skip directories never created
         if [[ -d "$base/$dir" ]]; then
             for entry in "$base/$dir/"*; do
-                local fn="${entry##*/}"
+                # Get filename, with trailing space from $entry removed (zsh).
+                local fn="${${entry%/}##*/}"
                 if [[ -f "$entry" ]]; then
                     echo "@ $dir/$fn"
                     local line=

lib/core/smartcd_template

@@ -32,7 +32,7 @@ function smartcd_template() {
 
                     command mkdir -p "$base/templates"
                     if [[ ! -f "$base/templates/$name" ]]; then
-                        command cat <<EOF >> "$base/templates/$name"
+                        command cat <<EOF > "$base/templates/$name"
 ########################################################################
 # This is a smartcd template.  Edit this file to create a named
 # configuration you can copy to any number of directories.  This is