Compare commits
No commits in common. "main" and "v0.1.3" have entirely different histories.
|
@ -5,7 +5,7 @@ completions=${args[--completions]:-}
|
|||
target=${args[target]:?}
|
||||
url=${args[url]:?}
|
||||
|
||||
if [ "${action:-file}" = "exe" ] && ! echo "$target" | grep -q "/"
|
||||
if [ "${action:-file}" = "exe" ]
|
||||
then
|
||||
if [ -x "$(command -v "$target")" ]
|
||||
then
|
||||
|
|
|
@ -4,7 +4,7 @@ group=${args[group]:?}
|
|||
file=${args[--file]:-}
|
||||
clean=${args[--clean]:-}
|
||||
|
||||
_install_entry() {
|
||||
_handle_entry() {
|
||||
type="$1"
|
||||
source="$2"
|
||||
target="$3"
|
||||
|
@ -32,36 +32,13 @@ _install_entry() {
|
|||
|
||||
if [[ $source = \$* ]]
|
||||
then
|
||||
source=$(eval "echo $source")
|
||||
source=$(eval "echo $source")
|
||||
fi
|
||||
install_args+=("$source")
|
||||
|
||||
install_args+=("$(eval "echo $target")")
|
||||
|
||||
"$0" "${install_args[@]}"
|
||||
}
|
||||
|
||||
_handle_entry() {
|
||||
unset AUTOINSTALL_ITEM_TYPE \
|
||||
AUTOINSTALL_ITEM_SOURCE \
|
||||
AUTOINSTALL_ITEM_TARGET \
|
||||
AUTOINSTALL_ITEM_HOOK \
|
||||
AUTOINSTALL_ITEM_PIPE \
|
||||
AUTOINSTALL_ITEM_COMPLETIONS
|
||||
|
||||
eval "$1"
|
||||
|
||||
# check if we have the required vars
|
||||
if [[ -z "${AUTOINSTALL_ITEM_TYPE:-}" \
|
||||
|| -z "${AUTOINSTALL_ITEM_SOURCE:-}" \
|
||||
|| -z "${AUTOINSTALL_ITEM_TARGET:-}" ]]
|
||||
then
|
||||
return
|
||||
fi
|
||||
|
||||
_install_entry "$AUTOINSTALL_ITEM_TYPE" "$AUTOINSTALL_ITEM_SOURCE" \
|
||||
"$AUTOINSTALL_ITEM_TARGET" "${AUTOINSTALL_ITEM_HOOK:-}" "${AUTOINSTALL_ITEM_PIPE:-}" "${AUTOINSTALL_ITEM_COMPLETIONS:-}"
|
||||
|
||||
"$0" "${install_args[@]}" || true # Continue on error
|
||||
}
|
||||
|
||||
file_lines=$(wc -l < "$file")
|
||||
|
@ -75,14 +52,33 @@ while [[ $line -lt $file_lines ]]; do
|
|||
continue
|
||||
fi
|
||||
|
||||
unset AUTOINSTALL_ITEM_TYPE \
|
||||
AUTOINSTALL_ITEM_SOURCE \
|
||||
AUTOINSTALL_ITEM_TARGET \
|
||||
AUTOINSTALL_ITEM_HOOK \
|
||||
AUTOINSTALL_ITEM_PIPE \
|
||||
AUTOINSTALL_ITEM_COMPLETIONS \
|
||||
AUTOINSTALL_ITEM_GROUPS
|
||||
eval "$entry"
|
||||
|
||||
# check if we have the required vars
|
||||
if [[ -z "${AUTOINSTALL_ITEM_TYPE:-}" \
|
||||
|| -z "${AUTOINSTALL_ITEM_SOURCE:-}" \
|
||||
|| -z "${AUTOINSTALL_ITEM_TARGET:-}" \
|
||||
|| -z "${AUTOINSTALL_ITEM_GROUPS:-}" ]]
|
||||
then
|
||||
continue
|
||||
fi
|
||||
|
||||
if [[ "$group" != "all" ]]
|
||||
then
|
||||
# check if group is in groups
|
||||
if ! echo "$entry" | grep -qE "^AUTOINSTALL_ITEM_GROUPS=\"(.*,)?$group(,.*)?\"$"
|
||||
if [[ ! "${AUTOINSTALL_ITEM_GROUPS}" =~ (^|,)$group(,|$) ]]
|
||||
then
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
|
||||
_handle_entry "$entry" || true # ignore errors
|
||||
_handle_entry "$AUTOINSTALL_ITEM_TYPE" "$AUTOINSTALL_ITEM_SOURCE" \
|
||||
"$AUTOINSTALL_ITEM_TARGET" "${AUTOINSTALL_ITEM_HOOK:-}" "${AUTOINSTALL_ITEM_PIPE:-}" "${AUTOINSTALL_ITEM_COMPLETIONS:-}"
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue