From c9c3b40b5ca6dc568186865490ba97a28ecd0e92 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Thu, 23 May 2013 15:58:55 -0400 Subject: [PATCH 1/7] [Fix #437] Always set $TMPDIR --- runcoms/zshenv | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/runcoms/zshenv b/runcoms/zshenv index 0f8738bf..9ff39e06 100644 --- a/runcoms/zshenv +++ b/runcoms/zshenv @@ -64,10 +64,13 @@ fi # Temporary Files # -if [[ -d "$TMPDIR" ]]; then - export TMPPREFIX="${TMPDIR%/}/zsh" - if [[ ! -d "$TMPPREFIX" ]]; then - mkdir -p "$TMPPREFIX" - fi +if [[ ! -d "$TMPDIR" ]]; then + export TMPDIR="/tmp/$USER" + mkdir -p -m 700 "$TMPDIR" +fi + +TMPPREFIX="${TMPDIR%/}/zsh" +if [[ ! -d "$TMPPREFIX" ]]; then + mkdir -p "$TMPPREFIX" fi From baf7f6184b730ffbaa631b8058f0bc65657e9816 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Thu, 23 May 2013 16:00:16 -0400 Subject: [PATCH 2/7] Do not substitute /tmp since $TMPDIR is always set --- modules/pacman/functions/pacman-list-disowned | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pacman/functions/pacman-list-disowned b/modules/pacman/functions/pacman-list-disowned index d6b6f289..2cd8a92b 100644 --- a/modules/pacman/functions/pacman-list-disowned +++ b/modules/pacman/functions/pacman-list-disowned @@ -6,7 +6,7 @@ # Sorin Ionescu # -local tmp="${TMPDIR:-/tmp}/pacman-disowned-$UID-$$" +local tmp="$TMPDIR/pacman-disowned-$UID-$$" local db="$tmp/db" local fs="$tmp/fs" From 0c9c099ac357c23ac4308cd6ba25c4f74bdf4328 Mon Sep 17 00:00:00 2001 From: Sebastian Wiesner Date: Wed, 22 May 2013 19:38:19 +0200 Subject: [PATCH 3/7] Add the RubyGems bin directory to PATH on other Unix systems Signed-off-by: Sorin Ionescu --- modules/ruby/init.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/ruby/init.zsh b/modules/ruby/init.zsh index b287cbb2..0303d5a3 100644 --- a/modules/ruby/init.zsh +++ b/modules/ruby/init.zsh @@ -28,6 +28,8 @@ else if [[ "$OSTYPE" == darwin* ]]; then export GEM_HOME="$HOME/Library/Ruby/Gems/1.8" path=("$GEM_HOME/bin" $path) + else + path=($HOME/.gem/ruby/*/bin(N) $path) fi fi @@ -58,4 +60,3 @@ if (( $+commands[bundle] )); then && print vendor/bundle >>! .gitignore \ && print vendor/cache >>! .gitignore' fi - From 20655c8b66907ff3cc879a8cbe7b82173b597e33 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Thu, 23 May 2013 19:10:21 -0400 Subject: [PATCH 4/7] [Fix #436] Remove Bombich rsync references --- modules/rsync/README.md | 8 ++------ modules/rsync/init.zsh | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/rsync/README.md b/modules/rsync/README.md index 2d2e6566..2ec21124 100644 --- a/modules/rsync/README.md +++ b/modules/rsync/README.md @@ -3,9 +3,6 @@ Rsync Defines [rsync][1] aliases. -Mac OS X users are encouraged to use [Bombich's rsync][2], which has HFS+ -enhancements. - Aliases ------- @@ -18,11 +15,10 @@ Aliases Authors ------- -*The authors of this module should be contacted via the [issue tracker][3].* +*The authors of this module should be contacted via the [issue tracker][2].* - [Sorin Ionescu](https://github.com/sorin-ionescu) [1]: http://rsync.samba.org -[2]: http://www.bombich.com/rsync.html -[3]: https://github.com/sorin-ionescu/prezto/issues +[2]: https://github.com/sorin-ionescu/prezto/issues diff --git a/modules/rsync/init.zsh b/modules/rsync/init.zsh index c3b3b577..802952cd 100644 --- a/modules/rsync/init.zsh +++ b/modules/rsync/init.zsh @@ -17,7 +17,6 @@ fi _rsync_cmd='rsync --verbose --progress --human-readable --compress --archive --hard-links --one-file-system' # Mac OS X and HFS+ Enhancements -# http://www.bombich.com/rsync.html if [[ "$OSTYPE" == darwin* ]] && grep -q 'file-flags' <(rsync --help 2>&1); then _rsync_cmd="${_rsync_cmd} --crtimes --acls --xattrs --fileflags --protect-decmpfs --force-change" fi From 9b945e26b998086b9823ad50302d9dbe2da4ad4a Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Fri, 24 May 2013 12:29:49 -0400 Subject: [PATCH 5/7] Revert "[Fix #436] Remove Bombich rsync references" This reverts commit 20655c8b66907ff3cc879a8cbe7b82173b597e33. --- modules/rsync/README.md | 8 ++++++-- modules/rsync/init.zsh | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/rsync/README.md b/modules/rsync/README.md index 2ec21124..2d2e6566 100644 --- a/modules/rsync/README.md +++ b/modules/rsync/README.md @@ -3,6 +3,9 @@ Rsync Defines [rsync][1] aliases. +Mac OS X users are encouraged to use [Bombich's rsync][2], which has HFS+ +enhancements. + Aliases ------- @@ -15,10 +18,11 @@ Aliases Authors ------- -*The authors of this module should be contacted via the [issue tracker][2].* +*The authors of this module should be contacted via the [issue tracker][3].* - [Sorin Ionescu](https://github.com/sorin-ionescu) [1]: http://rsync.samba.org -[2]: https://github.com/sorin-ionescu/prezto/issues +[2]: http://www.bombich.com/rsync.html +[3]: https://github.com/sorin-ionescu/prezto/issues diff --git a/modules/rsync/init.zsh b/modules/rsync/init.zsh index 802952cd..c3b3b577 100644 --- a/modules/rsync/init.zsh +++ b/modules/rsync/init.zsh @@ -17,6 +17,7 @@ fi _rsync_cmd='rsync --verbose --progress --human-readable --compress --archive --hard-links --one-file-system' # Mac OS X and HFS+ Enhancements +# http://www.bombich.com/rsync.html if [[ "$OSTYPE" == darwin* ]] && grep -q 'file-flags' <(rsync --help 2>&1); then _rsync_cmd="${_rsync_cmd} --crtimes --acls --xattrs --fileflags --protect-decmpfs --force-change" fi From f007820a14648c9caae4f1e702e2e4118199cb9b Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Fri, 24 May 2013 12:33:23 -0400 Subject: [PATCH 6/7] [Fix #436] Update link to Bombich rsync --- modules/rsync/README.md | 2 +- modules/rsync/init.zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rsync/README.md b/modules/rsync/README.md index 2d2e6566..a2b62c4f 100644 --- a/modules/rsync/README.md +++ b/modules/rsync/README.md @@ -23,6 +23,6 @@ Authors - [Sorin Ionescu](https://github.com/sorin-ionescu) [1]: http://rsync.samba.org -[2]: http://www.bombich.com/rsync.html +[2]: http://help.bombich.com/kb/overview/credits#opensource [3]: https://github.com/sorin-ionescu/prezto/issues diff --git a/modules/rsync/init.zsh b/modules/rsync/init.zsh index c3b3b577..afb9192a 100644 --- a/modules/rsync/init.zsh +++ b/modules/rsync/init.zsh @@ -17,7 +17,7 @@ fi _rsync_cmd='rsync --verbose --progress --human-readable --compress --archive --hard-links --one-file-system' # Mac OS X and HFS+ Enhancements -# http://www.bombich.com/rsync.html +# http://help.bombich.com/kb/overview/credits#opensource if [[ "$OSTYPE" == darwin* ]] && grep -q 'file-flags' <(rsync --help 2>&1); then _rsync_cmd="${_rsync_cmd} --crtimes --acls --xattrs --fileflags --protect-decmpfs --force-change" fi From 16aa48baeb92866a1921ce2199f2cba1099ce22c Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Sat, 25 May 2013 14:39:51 -0400 Subject: [PATCH 7/7] Rename archive module functions --- modules/README.md | 2 +- modules/archive/README.md | 6 +++--- modules/archive/functions/{_ls-archive => _lsarchive} | 4 ++-- modules/archive/functions/{_extract => _unarchive} | 4 ++-- modules/archive/functions/{ls-archive => lsarchive} | 2 +- modules/archive/functions/{extract => unarchive} | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename modules/archive/functions/{_ls-archive => _lsarchive} (85%) rename modules/archive/functions/{_extract => _unarchive} (85%) rename modules/archive/functions/{ls-archive => lsarchive} (95%) rename modules/archive/functions/{extract => unarchive} (97%) diff --git a/modules/README.md b/modules/README.md index 16754fcb..2d89b1d9 100644 --- a/modules/README.md +++ b/modules/README.md @@ -8,7 +8,7 @@ Load modules in *zpreztorc*. The order matters. Archive ------- -Provides functions to extract and list popular archive formats. +Provides functions to list and extract archives. Command-Not-Found ----------------- diff --git a/modules/archive/README.md b/modules/archive/README.md index 37dbf121..64b95df7 100644 --- a/modules/archive/README.md +++ b/modules/archive/README.md @@ -1,13 +1,13 @@ Archive ======= -Provides functions to extract and list popular archive formats. +Provides functions to list and extract archives. Functions --------- - - `extract` extracts the contents of one or more archives. - - `ls-archive` lists the contents of one or more archives. + - `lsarchive` lists the contents of one or more archives. + - `unarchive` extracts the contents of one or more archives. Supported Formats ----------------- diff --git a/modules/archive/functions/_ls-archive b/modules/archive/functions/_lsarchive similarity index 85% rename from modules/archive/functions/_ls-archive rename to modules/archive/functions/_lsarchive index 00453c4f..516a8a33 100644 --- a/modules/archive/functions/_ls-archive +++ b/modules/archive/functions/_lsarchive @@ -1,8 +1,8 @@ -#compdef ls-archive +#compdef lsarchive #autoload # -# Completes ls-archive. +# Completes lsarchive. # # Authors: # Sorin Ionescu diff --git a/modules/archive/functions/_extract b/modules/archive/functions/_unarchive similarity index 85% rename from modules/archive/functions/_extract rename to modules/archive/functions/_unarchive index 901a8489..a446cb4a 100644 --- a/modules/archive/functions/_extract +++ b/modules/archive/functions/_unarchive @@ -1,8 +1,8 @@ -#compdef extract +#compdef unarchive #autoload # -# Completes extract. +# Completes unarchive. # # Authors: # Sorin Ionescu diff --git a/modules/archive/functions/ls-archive b/modules/archive/functions/lsarchive similarity index 95% rename from modules/archive/functions/ls-archive rename to modules/archive/functions/lsarchive index 99ebde6e..bac540f8 100644 --- a/modules/archive/functions/ls-archive +++ b/modules/archive/functions/lsarchive @@ -1,5 +1,5 @@ # -# Lists the contents of popular archive formats. +# Lists the contents of archives. # # Authors: # Sorin Ionescu diff --git a/modules/archive/functions/extract b/modules/archive/functions/unarchive similarity index 97% rename from modules/archive/functions/extract rename to modules/archive/functions/unarchive index 70fac4d8..36fe85b6 100644 --- a/modules/archive/functions/extract +++ b/modules/archive/functions/unarchive @@ -1,5 +1,5 @@ # -# Extracts the contents of popular archive formats. +# Extracts the contents of archives. # # Authors: # Sorin Ionescu