b29095fe68d8a63a6ed9514a812206222fa27d74

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #4354 from henrikhodne/patch-1

chruby: donʼt try to execute .sh files before loading

Diff

 1diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
 2index b461b0c9be7d5b39a27ebc7d646e93434e57e15a..5be6528b0edbcf818ca8ccd52d6cc7a619de7079 100644
 3--- a/plugins/chruby/chruby.plugin.zsh
 4+++ b/plugins/chruby/chruby.plugin.zsh
 5@@ -45,11 +45,11 @@ _source_from_omz_settings() {
 6     zstyle -s :omz:plugins:chruby path _chruby_path
 7     zstyle -s :omz:plugins:chruby auto _chruby_auto
 8 
 9-    if ${_chruby_path} && [[ -r ${_chruby_path} ]]; then
10+    if [[ -r ${_chruby_path} ]]; then
11         source ${_chruby_path}
12     fi
13 
14-    if ${_chruby_auto} && [[ -r ${_chruby_auto} ]]; then
15+    if [[ -r ${_chruby_auto} ]]; then
16         source ${_chruby_auto}
17     fi
18 }