linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-23 02:35:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from NerRobDog/codex/fix-ansible-init-directory-creation-errors

Browse source 
Fix ansible-init path handling and completions
This commit is contained in:
NerRobDog 2025-09-19 15:25:28 +03:00 • committed by GitHub
commit e222b823f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
custom/plugins/ansible-init/ansible-init.plugin.zsh
View file

@ -16,21 +16,26 @@
_ans_i_echo() { print -P "%F{cyan}[ansible-init]%f $*"; } _ans_i_echo() { print -P "%F{cyan}[ansible-init]%f $*"; }
_ans_i_err() { print -P "%F{red}[ansible-init]%f $*" >&2; } _ans_i_err() { print -P "%F{red}[ansible-init]%f $*" >&2; }
# mkdir -p if missing # mkdir -p if missing (supports multiple paths and ignores aliases)
_ans_i_mk() { [[ -d "$1" ]] || mkdir -p "$1" } _ans_i_mk() {
local dir
for dir in "$@"; do
[[ -d "$dir" ]] || command mkdir -p "$dir"
done
}
# Create/overwrite file conditionally # Create/overwrite file conditionally
# usage: _ans_i_write <path> <content> [force(0|1)] # usage: _ans_i_write <file_path> <content> [force(0|1)]
_ans_i_write() { _ans_i_write() {
local path="$1"; shift local file_path="$1"; shift
local content="$1"; shift local content="$1"; shift
local force="${1:-0}" local force="${1:-0}"
if [[ -e "$path" && "$force" != "1" ]]; then if [[ -e "$file_path" && "$force" != "1" ]]; then
_ans_i_echo "skip: $path (exists)" _ans_i_echo "skip: $file_path (exists)"
return 0 return 0
fi fi
print -r -- "$content" > "$path" print -r -- "$content" > "$file_path"
_ans_i_echo "write: $path" _ans_i_echo "write: $file_path"
} }
# Global help # Global help
@ -334,8 +339,8 @@ ansible-init() {
return 0 return 0
fi fi
# Collect args (name, path, flags) # Collect args (name, destination path, flags)
local name="" path="" force_flag=0 local name="" dest_path="" force_flag=0
local args=("$@") local args=("$@")
for a in "${args[@]}"; do for a in "${args[@]}"; do
case "$a" in case "$a" in
@ -346,7 +351,7 @@ ansible-init() {
-h|--help) print "usage: ansible-init new [NAME] [PATH] [--minimal|--standard|--full] [--force]"; return 0 ;; -h|--help) print "usage: ansible-init new [NAME] [PATH] [--minimal|--standard|--full] [--force]"; return 0 ;;
*) *)
if [[ -z "$name" ]]; then name="$a" if [[ -z "$name" ]]; then name="$a"
elif [[ -z "$path" ]]; then path="$a" elif [[ -z "$dest_path" ]]; then dest_path="$a"
fi fi
;; ;;
esac esac
@ -358,10 +363,10 @@ ansible-init() {
if [[ "$name" == "." ]]; then if [[ "$name" == "." ]]; then
_ans_i_scaffold "." "$PWD" "$force_flag" _ans_i_scaffold "." "$PWD" "$force_flag"
else else
if [[ "$path" == "." ]]; then if [[ "$dest_path" == "." ]]; then
_ans_i_scaffold "$name" "$PWD/$name" "$force_flag" _ans_i_scaffold "$name" "$PWD/$name" "$force_flag"
else else
_ans_i_scaffold "$name" "${path:-$ANSIBLE_INIT_BASE/$name}" "$force_flag" _ans_i_scaffold "$name" "${dest_path:-$ANSIBLE_INIT_BASE/$name}" "$force_flag"
fi fi
fi fi
;; ;;
@ -401,7 +406,9 @@ _ans_i_complete() {
esac esac
fi fi
} }
compdef _ans_i_complete ansible-init if (( $+functions[compdef] )); then
compdef _ans_i_complete ansible-init
fi
# --- Extensions loader -------------------------------------------------------- # --- Extensions loader --------------------------------------------------------
# Доп. команды можно класть как *.zsh в .../plugins/ansible-init/extensions/ # Доп. команды можно класть как *.zsh в .../plugins/ansible-init/extensions/