Merge branch 'master' into feature/eks-support

This commit is contained in:
Dor Munis 2023-05-15 10:55:40 +03:00 committed by GitHub
commit b8d1c83e84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 15 deletions

View file

@ -1,29 +1,24 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# return current working directory of tmux pane # return current working directory of tmux pane
getPaneDir() getPaneDir() {
{
nextone="false" nextone="false"
for i in $(tmux list-panes -F "#{pane_active} #{pane_current_path}"); ret=""
do for i in $(tmux list-panes -F "#{pane_active} #{pane_current_path}"); do
if [ "$nextone" == "true" ]; then [ "$i" == "1" ] && nextone="true" && continue
echo $i [ "$i" == "0" ] && nextone="false"
return [ "$nextone" == "true" ] && ret+="$i "
fi
if [ "$i" == "1" ]; then
nextone="true"
fi
done done
echo "${ret%?}"
} }
main() main() {
{
path=$(getPaneDir) path=$(getPaneDir)
# change '/home/user' to '~' # change '/home/user' to '~'
cwd=$(echo $path | sed "s;$HOME;~;g") cwd="${path/"$HOME"/'~'}"
echo $cwd echo "$cwd"
} }
#run main driver program #run main driver program

View file

@ -12,6 +12,7 @@ main()
eks_hide_arn=$(get_tmux_option "@dracula-kubernetes-eks-hide-arn" false) eks_hide_arn=$(get_tmux_option "@dracula-kubernetes-eks-hide-arn" false)
eks_extract_account=$(get_tmux_option "@dracula-kubernetes-eks-extract-account" false) eks_extract_account=$(get_tmux_option "@dracula-kubernetes-eks-extract-account" false)
hide_kubernetes_user=$(get_tmux_option "@dracula-kubernetes-hide-user" false) hide_kubernetes_user=$(get_tmux_option "@dracula-kubernetes-hide-user" false)
terraform_label=$(get_tmux_option "@dracula-terraform-label" "")
show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true) show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true)
show_location=$(get_tmux_option "@dracula-show-location" true) show_location=$(get_tmux_option "@dracula-show-location" true)
fixed_location=$(get_tmux_option "@dracula-fixed-location") fixed_location=$(get_tmux_option "@dracula-fixed-location")
@ -199,6 +200,11 @@ main()
elif [ $plugin = "kubernetes-context" ]; then elif [ $plugin = "kubernetes-context" ]; then
IFS=' ' read -r -a colors <<<$(get_tmux_option "@dracula-kubernetes-context-colors" "cyan dark_gray") IFS=' ' read -r -a colors <<<$(get_tmux_option "@dracula-kubernetes-context-colors" "cyan dark_gray")
script="#($current_dir/kubernetes_context.sh $eks_hide_arn $eks_extract_account $hide_kubernetes_user $show_kubernetes_context_label)" script="#($current_dir/kubernetes_context.sh $eks_hide_arn $eks_extract_account $hide_kubernetes_user $show_kubernetes_context_label)"
elif [ $plugin = "terraform" ]; then
IFS=' ' read -r -a colors <<<$(get_tmux_option "@dracula-terraform-colors" "light_purple dark_gray")
script="#($current_dir/terraform.sh $terraform_label)"
elif [ $plugin = "weather" ]; then elif [ $plugin = "weather" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-weather-colors" "orange dark_gray") IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-weather-colors" "orange dark_gray")
script="#($current_dir/weather_wrapper.sh $show_fahrenheit $show_location $fixed_location)" script="#($current_dir/weather_wrapper.sh $show_fahrenheit $show_location $fixed_location)"

30
scripts/terraform.sh Executable file
View file

@ -0,0 +1,30 @@
#!/usr/bin/env bash
# setting the locale, some users have issues with different locales, this forces the correct one
export LC_ALL=en_US.UTF-8
label=$1
current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $current_dir/utils.sh
main() {
# storing the refresh rate in the variable RATE, default is 5
RATE=$(get_tmux_option "@dracula-refresh-rate" 5)
OUTPUT_STRING="N/A"
terraform_dir="$(tmux display-message -p '#{pane_current_path}')/.terraform"
if [ -d $terraform_dir ]; then
current_workspace=$(terraform workspace show 2>/dev/null)
OUTPUT_STRING="${current_workspace}"
fi
if [ "$label" = "" ]
then
echo "⚙️ ${OUTPUT_STRING}"
else
echo "⚙️ ${label} ${OUTPUT_STRING}"
fi
sleep $RATE
}
# run the main driver
main