bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: initial args clean up

Browse Source
This commit is contained in:
Dylan Araps 2021-07-27 20:56:43 +03:00
parent 61a3177051
commit c2e630c365
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 89 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
kiss
View File

@ -1027,7 +1027,23 @@ pkg_build() {
run_hook post-build "$1" "$pkg_dir/$1"
}
pkg_checksums() {
pkg_checksum() {
pkg_source "$1" c
[ -f "$repo_dir/sources" ] || continue
pkg_checksum_gen
if ok "$hash"; then
printf '%s\n' "$hash" > "$repo_dir/checksums"
log "$1" "Generated checksums"
else
log "$1" "No sources needing checksums"
fi
}
pkg_checksum_gen() {
# Generate checksums for packages.
#
# NOTE: repo_ comes from caller.
@ -1050,7 +1066,7 @@ pkg_verify() {
log "$repo_name" "Verifying sources"
# Generate a new set of checksums to compare against.
pkg_checksums >/dev/null
pkg_checksum_gen >/dev/null
# Intentional, globbing disabled.
# shellcheck disable=2038,2086
@ -1173,6 +1189,25 @@ pkg_conflicts() {
fi
}
pkg_alternatives() {
if equ "$1" -; then
while read -r pkg path; do
pkg_swap "$pkg" "$path"
done
elif ok "$1"; then
pkg_swap "$@"
else
# Go over each alternative and format the file
# name for listing. (pkg_name>usr>bin>ls)
set +f; for pkg in "$sys_ch/"*; do
fnr "${pkg##*/}" '>' '/'
printf '%s %s\n' "${_fnr%%/*}" "/${_fnr#*/}"
done
fi
}
pkg_swap() {
# Swap between package alternatives.
[ -d "$sys_db/$1" ] || die "'$1' not found"
@ -1685,6 +1720,42 @@ pkg_clean() {
esac
}
pkg_help_ext() {
log 'Installed extensions (kiss-* in PATH)'
# Intentional, globbing disabled.
# shellcheck disable=2046,2030,2031
set -- $(pkg_find kiss-\* all -x "$PATH")
# To align descriptions figure out which extension has the longest
# name by doing a simple 'name > max ? name : max' on the basename
# of the path with 'kiss-' stripped as well.
#
# This also removes any duplicates found in '$PATH', picking the
# first match.
for path do p=${path#*/kiss-}
case " $seen " in
*" $p "*) shift ;;
*) seen=" $seen $p " max=$((${#p} > max ? ${#p}+1 : max))
esac
done
IFS=\#$IFS
# Print each extension, grab its description from the second line
# in the file and align the output based on the above max.
for path do
# Open the extension as a file descriptor.
exec 3< "$path"
# Grab the second line in the extension.
{ read -r _ && read -r _ cmt; } <&3
printf "%b->%b %-${max}s %s\\n" \
"$c1" "$c3" "${path#*/kiss-}" "$cmt"
done >&2
}
args() {
# Parse script arguments manually. This is rather easy to do in our case
# since the first argument is always an "action" and the arguments that
@ -1769,46 +1840,12 @@ args() {
# Actions can be abbreviated to their first letter. This saves keystrokes
# once you memorize the commands.
case $action in
a|alternatives)
if equ "$1" -; then
while read -r pkg path; do
pkg_swap "$pkg" "$path"
done
elif ok "$1"; then
pkg_swap "$@"
else
# Go over each alternative and format the file
# name for listing. (pkg_name>usr>bin>ls)
set +f; for pkg in "$sys_ch/"*; do
fnr "${pkg##*/}" '>' '/'
printf '%s %s\n' "${_fnr%%/*}" "/${_fnr#*/}"
done
fi
;;
c|checksum)
for pkg do
pkg_source "$pkg" c
[ -f "$repo_dir/sources" ] || continue
pkg_checksums
if ok "$hash"; then
printf '%s\n' "$hash" > "$repo_dir/checksums"
log "$pkg" "Generated checksums"
else
log "$pkg" "No sources needing checksums"
fi
done
;;
i|install) for pkg do pkg_install "$pkg"; done ;;
a|alternatives) pkg_alternatives "$@" ;;
b|build) pkg_build_all "${@:?No packages installed}" ;;
c|checksum) for pkg do pkg_checksum "$pkg"; done ;;
d|download) for pkg do pkg_source "$pkg"; done ;;
H|help-ext) pkg_help_ext "$@" ;;
i|install) for pkg do pkg_install "$pkg"; done ;;
l|list) pkg_list_version "$@" ;;
r|remove) for pkg in $redro; do pkg_remove "$pkg"; done ;;
s|search) for pkg do pkg_find "$pkg" all; done ;;
@ -1817,7 +1854,7 @@ args() {
v|version) printf '5.5.24\n' ;;
'')
log 'kiss [a|b|c|d|i|l|r|s|u|v] [pkg]...'
log 'kiss [a|b|c|d|i|l|r|s|u|U|v] [pkg]...'
log 'alternatives List and swap alternatives'
log 'build Build packages'
log 'checksum Generate checksums'
@ -1826,46 +1863,11 @@ args() {
log 'list List installed packages'
log 'remove Remove packages'
log 'search Search for packages'
log 'update Update the system'
log 'update Update the system and repositories'
log 'upgrade Update the system'
log 'version Package manager version'
printf '\nRun "kiss help-ext" to see all actions\n'
;;
help-ext)
log 'Installed extensions (kiss-* in PATH)'
# Intentional, globbing disabled.
# shellcheck disable=2046,2030,2031
set -- $(pkg_find kiss-\* all -x "$PATH")
# To align descriptions figure out which extension has the longest
# name by doing a simple 'name > max ? name : max' on the basename
# of the path with 'kiss-' stripped as well.
#
# This also removes any duplicates found in '$PATH', picking the
# first match.
for path do p=${path#*/kiss-}
case " $seen " in
*" $p "*) shift ;;
*) seen=" $seen $p " max=$((${#p} > max ? ${#p}+1 : max))
esac
done
IFS=\#$IFS
# Print each extension, grab its description from the second line
# in the file and align the output based on the above max.
for path do
# Open the extension as a file descriptor.
exec 3< "$path"
# Grab the second line in the extension.
{ read -r _ && read -r _ cmt; } <&3
printf "%b->%b %-${max}s %s\\n" \
"$c1" "$c3" "${path#*/kiss-}" "$cmt"
done >&2
printf '\nRun "kiss [H|help-ext]" to see all actions\n'
;;
*)