quico-os-setup/zfs-pacman-hook
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

refactor(script): Reuse the same pkg name separator in a var (#1)

Browse Source
This commit is contained in:
hygienic-books 2023-03-07 00:04:00 +01:00
parent c9fcdb5b29
commit 776480a9a3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pacman-zfs-snapshot.sh
View File

@ -120,7 +120,7 @@ function write_pkg_list_oneline () {
if [[ "${severity}" == 'imp' ]]; then if [[ "${severity}" == 'imp' ]]; then
for pkg in "${important_pkgs_in_transaction[@]}"; do for pkg in "${important_pkgs_in_transaction[@]}"; do
if [[ "${unabridged_pkg_list_oneline}" ]]; then if [[ "${unabridged_pkg_list_oneline}" ]]; then
unabridged_pkg_list_oneline="${unabridged_pkg_list_oneline}"','"${pkg}" unabridged_pkg_list_oneline="${unabridged_pkg_list_oneline}${pkg_separator}${pkg}"
else else
unabridged_pkg_list_oneline="${pkg}" unabridged_pkg_list_oneline="${pkg}"
fi fi
@ -129,7 +129,7 @@ function write_pkg_list_oneline () {
if [[ "${#trivial_pkgs_in_transaction[@]}" -ge '1' ]]; then if [[ "${#trivial_pkgs_in_transaction[@]}" -ge '1' ]]; then
for pkg in "${trivial_pkgs_in_transaction[@]}"; do for pkg in "${trivial_pkgs_in_transaction[@]}"; do
if [[ "${unabridged_pkg_list_oneline}" ]]; then if [[ "${unabridged_pkg_list_oneline}" ]]; then
unabridged_pkg_list_oneline="${unabridged_pkg_list_oneline}"','"${pkg}" unabridged_pkg_list_oneline="${unabridged_pkg_list_oneline}${pkg_separator}${pkg}"
else else
unabridged_pkg_list_oneline="${pkg}" unabridged_pkg_list_oneline="${pkg}"
fi fi
@ -182,8 +182,8 @@ function trim_pkg_list_oneline () {
local shorter_pkg_list local shorter_pkg_list
shorter_pkg_list="${unabridged_pkg_list_oneline}" shorter_pkg_list="${unabridged_pkg_list_oneline}"
while [[ "${#shorter_pkg_list}" -gt "${pkgs_list_max_length}" ]]; do while [[ "${#shorter_pkg_list}" -gt "${pkgs_list_max_length}" ]]; do
shorter_pkg_list="${shorter_pkg_list%,*}" shorter_pkg_list="${shorter_pkg_list%${pkg_separator}*}"
if ! grep -Piq ',' <<<"${shorter_pkg_list}"; then if ! grep -Piq "${pkg_separator}" <<<"${shorter_pkg_list}"; then
# Only one package remains in package list, no need to continue # Only one package remains in package list, no need to continue
break break
fi fi