diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-12-11 09:53:12 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-12-11 09:53:12 +0000 |
| commit | b4a2d51e57b1f50db4b9e489652daf35f1e583d0 (patch) | |
| tree | ec0ce579ca82b5498ee579f415cc81d838702dd2 /Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | |
| parent | 37a4dce4bc5b38a686516e22d0dc81a90b757d91 (diff) | |
| download | zsh-b4a2d51e57b1f50db4b9e489652daf35f1e583d0.tar.gz zsh-b4a2d51e57b1f50db4b9e489652daf35f1e583d0.tar.xz zsh-b4a2d51e57b1f50db4b9e489652daf35f1e583d0.zip | |
Frank Terbeck: 26125: add "command" style to VCS_INFO
Diffstat (limited to 'Functions/VCS_Info/Backends/VCS_INFO_detect_p4')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 index d9475fa01..377453f6a 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 +++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 @@ -21,7 +21,7 @@ VCS_INFO_p4_get_server() { setopt extendedglob local -a settings - settings=(${(f)"$(p4 set)"}) + settings=(${(f)"$(${vcs_comm[cmd]} set)"}) serverport=${${settings[(r)P4PORT=*]##P4PORT=}%% *} case $serverport in (''|:) @@ -54,7 +54,7 @@ VCS_INFO_detect_p4() { VCS_INFO_p4_get_server [[ -n $vcs_info_p4_dead_servers[$serverport] ]] && return 1 fi - if p4where="$(p4 where 2>&1)"; then + if p4where="$(${vcs_comm[cmd]} where 2>&1)"; then return 0 fi if [[ $p4where = *"Connect to server failed"* ]]; then @@ -67,7 +67,7 @@ VCS_INFO_detect_p4() { return 1 else [[ -n ${P4CONFIG} ]] || return 1 - VCS_INFO_check_com p4 || return 1 + VCS_INFO_check_com ${vcs_comm[cmd]} || return 1 vcs_comm[detect_need_file]="${P4CONFIG}" VCS_INFO_bydir_detect . return $? |