Permalink
Browse files

Proper capitalization of Zsh

  • Loading branch information...
1 parent 7a411b2 commit 9f3c2d3fe46710b4b3ae4f012cd622ed4c90a1e3 kakekake89 committed Jun 7, 2013
Showing with 24 additions and 24 deletions.
  1. +1 −1 FORMATTING.md
  2. +14 −14 History.txt
  3. +2 −2 help/upgrade-notes.txt
  4. +2 −2 scripts/functions/installer
  5. +1 −1 scripts/functions/support
  6. +2 −2 scripts/functions/utility_logging
  7. +1 −1 scripts/hook
  8. +1 −1 scripts/notes
View
2 FORMATTING.md
@@ -30,7 +30,7 @@ Variables defined in one local in function are available in all other functions
```bash
[[ -n "${var:-}" ]] # var is set
[[ "${var:-}" == "bla" ]] # var equals bla
-[[ -n "${var1:-}" && # multi line check, first check has to be after [[ - for ZSH
+[[ -n "${var1:-}" && # multi line check, first check has to be after [[ - for Zsh
-n "${var2:-}" &&
-n "${var3:-}"
]]
View
28 History.txt
@@ -153,7 +153,7 @@
* Fixed rvm.sh setting path for global installs.
* Fix FreeBSD "pw groupadd" syntax.
* Merge pull request #337 from MagLev/MagLev-26197
-* Wrestling the ZSH beastiality beast.
+* Wrestling the Zsh beastiality beast.
* Updated to MagLev-26197
* Fixed incorrect formatting and inconsistency.
* Adjusted testing for teardown.
@@ -554,7 +554,7 @@
* Added hint for OSX users
* Add example for tweaking Gem options
* Loading cleanup, adjusting more for zsh.
-* Bugfix: ZSH random declare. Adjusted rvm_user_install with _flag postfix as that is what it is. Corrected usage of rvm_user_install_flag.
+* Bugfix: Zsh random declare. Adjusted rvm_user_install with _flag postfix as that is what it is. Corrected usage of rvm_user_install_flag.
* Merge branch 'master' of github.com:wayneeseguin/rvm
* Bugfix: do not allow missetting of rvm pretty print flag to blow up.
* Merged pull request #258 from pweldon/fix_config_user_mv.
@@ -644,7 +644,7 @@
* Updated to MagLev-25681
* Merge branch 'master' of https://github.com/skaes/rvm into skaes-master
* Take rubygems to 1.6.2 until I can complete the new feature.
-* Fixes bug with calling shopt with ZSH
+* Fixes bug with calling shopt with Zsh
* run autoconf if the configure script is older than configure.in
* Updated ebuild for latest release.
@@ -872,7 +872,7 @@
* Ensure that rvm_gemset_name is unset for gemset copy.
* Unset gemset name.
* Respect PAGER while still protecting from .rvmrc based attacks.
-* ZSH auto_name_dirs feature is troublesome :)
+* Zsh auto_name_dirs feature is troublesome :)
* Added comments and a sanity check to the trap.
* Shut your trap!
* Merge branch 'disk_usage_symlink' of https://github.com/ilikepi/rvm into ilikepi-disk_usage_symlink
@@ -938,10 +938,10 @@
* Added sanity check to rm for tmp cleanup, suggested by sven schwyn.
* Merge branch 'master' of https://github.com/caius/rvm
* Bugfix: Manage script variable truncation.
-* Stop ZSH warning about unmatched globs by setting an option.
-* Revert "Supress a warning when cleaning up ./tmp under ZSH"
+* Stop Zsh warning about unmatched globs by setting an option.
+* Revert "Supress a warning when cleaning up ./tmp under Zsh"
* Merge branch 'master' of https://github.com/ferrous26/rvm
-* Supress a warning when cleaning up ./tmp under ZSH
+* Supress a warning when cleaning up ./tmp under Zsh
* Began revising get to be able to specify a specific revision.
* cd will need some work to be configurable for scripts.
* MacRuby latest release is now version 0.9
@@ -1629,7 +1629,7 @@
* Array!
* Cleanup any swap files found in rvm_path, if they exist.
* Missed a few variables during teardown, thanks bjencks!
-* Bugfix: Adjusted loading detection to accommodate for ZSH. Thanks eregon.
+* Bugfix: Adjusted loading detection to accommodate for Zsh. Thanks eregon.
* Added ~/.rvm/hooks/after_cd hook ability to RVM.
* Simplified rvm function detection.
* RVM now detects whether it is loaded in the current shell as a function when sourced.
@@ -1658,7 +1658,7 @@
== Release 1.0.8
* Fixed double or nothing bug.
* Almost there, double or nothing eh?
-* This time I have ZSH to thank for finding a bug.
+* This time I have Zsh to thank for finding a bug.
* Cleaned up upgraded/migrate usage().
* Missed a spot.
* Bugfix: rvm gemset list. Thanks ianw!
@@ -1718,7 +1718,7 @@
* I just *love* the way CentOS keeps their systems up to date :/
* Bugfix: bashd zsh.
* I need to go back to kindergarden and learn how to type.
-* More fun with ZSH.
+* More fun with Zsh.
* Removed -G, --archives, --src path options in preparation for consolidation and "system vs user".
* Removed exit on cleanup.
* Some people like consistency too much :/
@@ -1798,15 +1798,15 @@
* Merge branch 'master' of github.com:wayneeseguin/rvm
* Bugfix: global cache return value.
* Quote $PATH when used with printf to defined $new_path. This allows spaces in $PATH.
-* Fix ZSH completion for the new command disk-usage
+* Fix Zsh completion for the new command disk-usage
* Fixed tyop, added consistency
* Bugfix: default gemsets now import.
* Let us be more direct, shall we?
* Thanks to Sutto (Darcy) for pointing out the obvious.
* Turns out older bash shells could not handle the redirect operator :/
* Added error handling around the sourcing of primary scripts when loading RVM.
-* Bugfix: ZSH did not like unset/declare.
-* ZSH goosed me.
+* Bugfix: Zsh did not like unset/declare.
+* Zsh goosed me.
* Finally got around to fixing scripts/log ;)
* Forgot to export PS4, thanks thewoolleyman!
* Bugfix: rvm default gemsets now load properly.
@@ -3683,7 +3683,7 @@
== Release 0.0.45
* JSON output reformatted and workign in zsh as well.
-* Bugfix: ZSH yaml fix.
+* Bugfix: Zsh yaml fix.
* Feature: 'rvm install X,Y,'Z works as intended. Bugfix: 'rvm install jruby'
* Make rvm debug slightly more useful when helping people.
* Bugfix: 'rvm do' === 'rvm rubydo'
View
4 help/upgrade-notes.txt 100755 → 100644
@@ -13,8 +13,8 @@
* In case you have some old RVM files/rubies in '/usr/local/bin' or '$HOME/bin' feel free to remove them,
they were copied there because of bug in path detection.
- * ZSH 4.3.15 is buggy, be careful with it, it can break RVM, especially multiuser installations,
- You should consider downgrading ZSH to 4.3.12 which has proven to work more reliable with RVM.
+ * Zsh 4.3.15 is buggy, be careful with it, it can break RVM, especially multiuser installations,
+ You should consider downgrading Zsh to 4.3.12 which has proven to work more reliable with RVM.
* Optionally you can run \`rvm tools rvm-env ruby bash\` which will generate
shebang wrappers for easier selecting ruby in scripts.
View
4 scripts/functions/installer
@@ -1171,11 +1171,11 @@ setup_user_profile_summary()
typeset __missing=""
if (( __bash_included>0 && __zsh_included>0 ))
- then __missing="Bash nor ZSH"
+ then __missing="Bash or Zsh"
elif (( __bash_included>0 ))
then __missing="Bash"
elif (( __zsh_included>0 ))
- then __missing="ZSH"
+ then __missing="Zsh"
fi
if [[ -n "${__missing}" ]]
then rvm_warn " RVM ${__target} line not found for ${__missing}, run the installer with '--auto-dotfiles' to fix it."
View
2 scripts/functions/support
@@ -172,7 +172,7 @@ __rvm_cd()
return $ret
}
-# Drop in replacement for which compatible with OSX / ZSH
+# Drop in replacement for which compatible with OSX / Zsh
__rvm_which()
{
if command which --skip-alias --skip-functions which >/dev/null 2>&1
View
4 scripts/functions/utility_logging
@@ -91,7 +91,7 @@ __rvm_dotted_run()
if
[[ -n "${ZSH_VERSION:-}" ]]
then
- rvm_log "${__message} - using ZSH, can not show progress, be patient..."
+ rvm_log "${__message} - using Zsh, can not show progress, be patient..."
"$@" > "${__log_file}" 2>&1 || return $?
else
"$@" | tee -a "${__log_file}" | __rvm_dotted "${__message}"
@@ -130,7 +130,7 @@ __rvm_log_dotted()
if
[[ -n "${ZSH_VERSION:-}" ]]
then
- rvm_log "${__message} - using ZSH, can not show progress, be patient..."
+ rvm_log "${__message} - using Zsh, can not show progress, be patient..."
"$@" > "${__log_file}" 2>&1 || return $?
else
"$@" 2>&1 | tee -a "${__log_file}" | __rvm_dotted "${__message}"
View
2 scripts/hook 100755 → 100644
@@ -5,7 +5,7 @@ typeset old_rvm_verbose_flag old_rvm_debug_flag >/dev/null 2>/dev/null
old_rvm_verbose_flag=${rvm_verbose_flag:-0}
old_rvm_debug_flag=${rvm_debug_flag:-0}
-# silence ZSH redefinitions
+# silence Zsh redefinitions
typeset rvm_verbose_flag rvm_debug_flag hooks >/dev/null 2>/dev/null
true rvm_verbose_flag:${rvm_verbose_flag:=${old_rvm_verbose_flag}} \
View
2 scripts/notes 100755 → 100644
@@ -168,7 +168,7 @@ $notes_type Notes:
(( 65536 * ${ZSH_VERSION:0:1} + 256 * ${ZSH_VERSION:2:1} + ${ZSH_VERSION:4} != 262924 ))
then
important_message "
- * WARNING: ZSH 4.3.12 is recommended, you have $ZSH_VERSION.
+ * WARNING: Zsh 4.3.12 is recommended, you have $ZSH_VERSION.
"
fi

0 comments on commit 9f3c2d3

Please sign in to comment.