Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix crab auto completion for zsh #5820

Merged
merged 2 commits into from May 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion crab/crab-env.sh.file
@@ -1,11 +1,15 @@
#!/bin/bash
#CMSDIST_FILE_REVISION=1
#CMSDIST_FILE_REVISION=2
cms_basedir="@CMS_PATH@/share/cms"
crab_shared_dir="${cms_basedir}/crab/@CRAB_COMMON_VERSION@"
for crab_latest in $(ls ${crab_shared_dir}/etc/crab-*.latest 2>/dev/null) ; do
crab_type=$(basename ${crab_latest} | sed 's|.latest$||;s|^crab-||')
crab_version=$(cat ${crab_latest})
if [ -e ${cms_basedir}/crab-${crab_type}/${crab_version}/etc/crab-bash-completion.sh ]; then
if [ $(ps -p$$ -ocmd=) = "zsh" ] ; then
autoload -U +X compinit && compinit
autoload -U +X bashcompinit && bashcompinit
fi
source ${cms_basedir}/crab-${crab_type}/${crab_version}/etc/crab-bash-completion.sh >/dev/null 2>&1
fi
unset crab_version crab_type
Expand Down
6 changes: 5 additions & 1 deletion crab/crab-setup.sh.file
@@ -1,5 +1,5 @@
#!/bin/bash
#CMSDIST_FILE_REVISION=1
#CMSDIST_FILE_REVISION=2
case "X$1Y" in
XprodY|XdevY|XpreY) CRABCLIENT_TYPE="$1" ;;
XY ) CRABCLIENT_TYPE="prod" ;;
Expand All @@ -12,5 +12,9 @@ esac
export CRABCLIENT_TYPE
crab_shared_dir="@CMS_PATH@/share/cms/crab/@CRAB_COMMON_VERSION@"
export PYTHONPATH="${crab_shared_dir}/lib/${CRABCLIENT_TYPE}${PYTHONPATH:+:$PYTHONPATH}"
if [ $(ps -p$$ -ocmd=) = "zsh" ] ; then
autoload -U +X compinit && compinit
autoload -U +X bashcompinit && bashcompinit
fi
complete -F _UseCrab_${CRABCLIENT_TYPE} -o filenames crab
unset crab_shared_dir