Use FZF_DEFAULT_OPTS

This commit is contained in:
Daniel Berteaud 2023-09-28 16:20:15 +02:00
parent 0a0c521f76
commit dbc00815ae
1 changed files with 4 additions and 4 deletions

8
ctctl
View File

@ -62,7 +62,7 @@ switch_env(){
if [ -z "${TARGET_DOM}" ]; then
echo "Select the container install you want to work on"
TARGET_DOM=$(ls_env | ${FZF_CMD})
TARGET_DOM=$(ls_env | fzf)
fi
if [ ! -e ~/.ctctl/${TARGET_DOM}/ctctl.conf ]; then
@ -97,7 +97,7 @@ switch_env(){
TARGET_NAMESPACE=$(ls_namespace)
else
echo "Select the namespace you are working in"
TARGET_NAMESPACE=$(ls_namespace | ${FZF_CMD})
TARGET_NAMESPACE=$(ls_namespace | fzf)
fi
fi
export CTCTL_ENV=${TARGET_NAMESPACE}
@ -407,7 +407,7 @@ build_required_images(){
# Build selected images
build_selected_images(){
local NO_CACHE=$1
for DOCKER_IMAGE in $(ls_build_docker_images | ${FZF_CMD} -m); do
for DOCKER_IMAGE in $(ls_build_docker_images | fzf -m); do
build_image "${DOCKER_IMAGE}" ${NO_CACHE}
done
}
@ -774,7 +774,7 @@ get_job_list(){
echo $JOBS
}
FZF_CMD=${CTCTL_FZF_CMD:-fzf --height=~10% --cycle --bind 'space:toggle' --marker='*'}
export FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-"--height=~10% --cycle --bind 'space:toggle' --marker='*'"}
case $1 in
current)