From 5fcb208d0b4dcd5c37ab694001871c971b22ac2f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 02:22:18 +0200 Subject: [PATCH 01/31] spcd.sh --- spcd.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 spcd.sh diff --git a/spcd.sh b/spcd.sh new file mode 100755 index 0000000..a577aed --- /dev/null +++ b/spcd.sh @@ -0,0 +1,27 @@ +#! /usr/bin/env sh + +gource \ +--auto-skip-seconds 1 \ +--date-format "%Y / %m / %d ⋅ %H : %M : %S" \ +--disable-progress \ +-f \ +--hide mouse,usernames \ +--highlight-dirs \ +--key \ +--output-framerate 60 \ +--seconds-per-day 2.0 \ +--output-ppm-stream - \ +| \ +ffmpeg \ +-codec:v ppm \ +-format image2pipe \ +-framerate 120 \ +-i - \ +-codec:v libx264 \ +-preset veryslow \ +-qp 23 \ +-movflags \ ++faststart \ +-pix_fmt yuv420p \ +-y \ +spcd.mp4 From 51c47f9c7863b79608dbc5ba25e49f2ff5a6a6aa Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 11:53:42 +0200 Subject: [PATCH 02/31] spree --- spcd.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index a577aed..42c1f46 100755 --- a/spcd.sh +++ b/spcd.sh @@ -9,8 +9,9 @@ gource \ --highlight-dirs \ --key \ --output-framerate 60 \ ---seconds-per-day 2.0 \ --output-ppm-stream - \ +--seconds-per-day 2.0 \ +--start-date "2024-08-18" \ | \ ffmpeg \ -codec:v ppm \ From 3eda7e3f865b637f46ef3dfaf38dde1b62bb900f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 11:58:46 +0200 Subject: [PATCH 03/31] viewport --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 42c1f46..5b19f64 100755 --- a/spcd.sh +++ b/spcd.sh @@ -4,7 +4,6 @@ gource \ --auto-skip-seconds 1 \ --date-format "%Y / %m / %d ⋅ %H : %M : %S" \ --disable-progress \ --f \ --hide mouse,usernames \ --highlight-dirs \ --key \ @@ -12,6 +11,7 @@ gource \ --output-ppm-stream - \ --seconds-per-day 2.0 \ --start-date "2024-08-18" \ +--viewport "1920x1080" \ | \ ffmpeg \ -codec:v ppm \ From 0d565927fd09f405d14fb9ee9e32f11c34af9e0a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 12:00:24 +0200 Subject: [PATCH 04/31] double --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 5b19f64..4a02dab 100755 --- a/spcd.sh +++ b/spcd.sh @@ -9,7 +9,7 @@ gource \ --key \ --output-framerate 60 \ --output-ppm-stream - \ ---seconds-per-day 2.0 \ +--seconds-per-day 4.0 \ --start-date "2024-08-18" \ --viewport "1920x1080" \ | \ From b4bd8dfd469498eb0e90c00ad2e807d798514e5d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 13:24:38 +0200 Subject: [PATCH 05/31] font-scale,frameless --- spcd.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spcd.sh b/spcd.sh index 4a02dab..ac31ebc 100755 --- a/spcd.sh +++ b/spcd.sh @@ -4,6 +4,8 @@ gource \ --auto-skip-seconds 1 \ --date-format "%Y / %m / %d ⋅ %H : %M : %S" \ --disable-progress \ +--font-scale 1.5 \ +--frameless \ --hide mouse,usernames \ --highlight-dirs \ --key \ From e15f10d6859e39feba4084bf38d400093b96c494 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 13:33:30 +0200 Subject: [PATCH 06/31] multi --- spcd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/spcd.sh b/spcd.sh index ac31ebc..c455b15 100755 --- a/spcd.sh +++ b/spcd.sh @@ -9,6 +9,7 @@ gource \ --hide mouse,usernames \ --highlight-dirs \ --key \ +--multi-sampling \ --output-framerate 60 \ --output-ppm-stream - \ --seconds-per-day 4.0 \ From 6999e326fdeee1ffb94dd44aff43f4164292a4c5 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 13:34:13 +0200 Subject: [PATCH 07/31] 720p --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index c455b15..2641129 100755 --- a/spcd.sh +++ b/spcd.sh @@ -14,7 +14,7 @@ gource \ --output-ppm-stream - \ --seconds-per-day 4.0 \ --start-date "2024-08-18" \ ---viewport "1920x1080" \ +--viewport "1280x720" \ | \ ffmpeg \ -codec:v ppm \ From 33153a1d3e6397e66ce90328fff99be9b4edc81c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 13:36:04 +0200 Subject: [PATCH 08/31] all --- spcd.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 2641129..238a5c3 100755 --- a/spcd.sh +++ b/spcd.sh @@ -13,7 +13,6 @@ gource \ --output-framerate 60 \ --output-ppm-stream - \ --seconds-per-day 4.0 \ ---start-date "2024-08-18" \ --viewport "1280x720" \ | \ ffmpeg \ From 8fc3761715dc7b8a61a1ce14d7bdf5003c467a24 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 13:36:38 +0200 Subject: [PATCH 09/31] space --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 238a5c3..88b9cde 100755 --- a/spcd.sh +++ b/spcd.sh @@ -2,7 +2,7 @@ gource \ --auto-skip-seconds 1 \ ---date-format "%Y / %m / %d ⋅ %H : %M : %S" \ +--date-format "%Y / %m / %d ⋅ %H : %M : %S" \ --disable-progress \ --font-scale 1.5 \ --frameless \ From cf5ce37ca55dc86092d6fa2ec75fb6ffd500eb79 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 13:43:23 +0200 Subject: [PATCH 10/31] input,track --- spcd.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 88b9cde..7e80357 100755 --- a/spcd.sh +++ b/spcd.sh @@ -2,8 +2,9 @@ gource \ --auto-skip-seconds 1 \ +--camera-mode "track" \ --date-format "%Y / %m / %d ⋅ %H : %M : %S" \ ---disable-progress \ +--disable-input \ --font-scale 1.5 \ --frameless \ --hide mouse,usernames \ From 125409e952b35bf7a37bbb9a8090b515b05d6042 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 14:14:10 +0200 Subject: [PATCH 11/31] overview --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 7e80357..fc25fbe 100755 --- a/spcd.sh +++ b/spcd.sh @@ -2,7 +2,7 @@ gource \ --auto-skip-seconds 1 \ ---camera-mode "track" \ +--camera-mode "overview" \ --date-format "%Y / %m / %d ⋅ %H : %M : %S" \ --disable-input \ --font-scale 1.5 \ From e2ddb7a44da87158eaf9968f9d1829ed485483c3 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 14:38:04 +0200 Subject: [PATCH 12/31] short --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index fc25fbe..3a72f80 100755 --- a/spcd.sh +++ b/spcd.sh @@ -13,7 +13,7 @@ gource \ --multi-sampling \ --output-framerate 60 \ --output-ppm-stream - \ ---seconds-per-day 4.0 \ +--seconds-per-day 1.3 \ --viewport "1280x720" \ | \ ffmpeg \ From 4ce26db50c45b05ede47e961a3035e7373894e5d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 15:00:31 +0200 Subject: [PATCH 13/31] tweaks --- spcd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd.sh b/spcd.sh index 3a72f80..a781b54 100755 --- a/spcd.sh +++ b/spcd.sh @@ -13,8 +13,8 @@ gource \ --multi-sampling \ --output-framerate 60 \ --output-ppm-stream - \ ---seconds-per-day 1.3 \ ---viewport "1280x720" \ +--seconds-per-day 0.9 \ +--viewport "1920x1080" \ | \ ffmpeg \ -codec:v ppm \ From 678385d2132b7390d55e03a66f7cb25011cda571 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 15:06:48 +0200 Subject: [PATCH 14/31] later/gource --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index f8d9ebc..da899c0 100644 --- a/readme.md +++ b/readme.md @@ -282,6 +282,7 @@ Handle project workflows in a unified way: ### Task stack * automate versions fetching +* gource, xvfb, xauth * handle openh264 repositories * tex * translate to french From eab76c5915bcbc353c1abdf343942436d9c0666e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 15:07:52 +0200 Subject: [PATCH 15/31] tweaks --- spcd.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd.sh b/spcd.sh index a781b54..a5bdf33 100755 --- a/spcd.sh +++ b/spcd.sh @@ -1,11 +1,11 @@ #! /usr/bin/env sh gource \ ---auto-skip-seconds 1 \ +--auto-skip-seconds 1.0 \ --camera-mode "overview" \ --date-format "%Y / %m / %d ⋅ %H : %M : %S" \ --disable-input \ ---font-scale 1.5 \ +--font-scale 2.0 \ --frameless \ --hide mouse,usernames \ --highlight-dirs \ @@ -13,7 +13,7 @@ gource \ --multi-sampling \ --output-framerate 60 \ --output-ppm-stream - \ ---seconds-per-day 0.9 \ +--seconds-per-day 0.8 \ --viewport "1920x1080" \ | \ ffmpeg \ From 4e81f9010454e8bb182229c5745f13216b99210c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 15:12:45 +0200 Subject: [PATCH 16/31] =?UTF-8?q?3=E2=88=954?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index a5bdf33..3aefe12 100755 --- a/spcd.sh +++ b/spcd.sh @@ -13,7 +13,7 @@ gource \ --multi-sampling \ --output-framerate 60 \ --output-ppm-stream - \ ---seconds-per-day 0.8 \ +--seconds-per-day 0.75 \ --viewport "1920x1080" \ | \ ffmpeg \ From fb73059f39be50b80b9b253bbbd81d00ee645c66 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 15:17:30 +0200 Subject: [PATCH 17/31] .7 --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 3aefe12..4cf9bd3 100755 --- a/spcd.sh +++ b/spcd.sh @@ -13,7 +13,7 @@ gource \ --multi-sampling \ --output-framerate 60 \ --output-ppm-stream - \ ---seconds-per-day 0.75 \ +--seconds-per-day 0.7 \ --viewport "1920x1080" \ | \ ffmpeg \ From c9e2107627e66857df30b1a10b6facfab014bb7e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 15:22:48 +0200 Subject: [PATCH 18/31] .5 --- spcd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd.sh b/spcd.sh index 4cf9bd3..d715853 100755 --- a/spcd.sh +++ b/spcd.sh @@ -1,7 +1,7 @@ #! /usr/bin/env sh gource \ ---auto-skip-seconds 1.0 \ +--auto-skip-seconds 0.5 \ --camera-mode "overview" \ --date-format "%Y / %m / %d ⋅ %H : %M : %S" \ --disable-input \ @@ -13,7 +13,7 @@ gource \ --multi-sampling \ --output-framerate 60 \ --output-ppm-stream - \ ---seconds-per-day 0.7 \ +--seconds-per-day 0.75 \ --viewport "1920x1080" \ | \ ffmpeg \ From ef26cdaa399fc73ba95596cb201bb568d5f37130 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 15:28:10 +0200 Subject: [PATCH 19/31] .7 --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index d715853..92e369f 100755 --- a/spcd.sh +++ b/spcd.sh @@ -13,7 +13,7 @@ gource \ --multi-sampling \ --output-framerate 60 \ --output-ppm-stream - \ ---seconds-per-day 0.75 \ +--seconds-per-day 0.7 \ --viewport "1920x1080" \ | \ ffmpeg \ From 1dc23e865c78e2b965578782f78f93abcff227f6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 15:32:28 +0200 Subject: [PATCH 20/31] 2.5 --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 92e369f..a1b2dd5 100755 --- a/spcd.sh +++ b/spcd.sh @@ -5,7 +5,7 @@ gource \ --camera-mode "overview" \ --date-format "%Y / %m / %d ⋅ %H : %M : %S" \ --disable-input \ ---font-scale 2.0 \ +--font-scale 2.5 \ --frameless \ --hide mouse,usernames \ --highlight-dirs \ From d4c2f51cf901404812940b264e2bfae60872dd92 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 15:39:09 +0200 Subject: [PATCH 21/31] end --- spcd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/spcd.sh b/spcd.sh index a1b2dd5..005dcb6 100755 --- a/spcd.sh +++ b/spcd.sh @@ -14,6 +14,7 @@ gource \ --output-framerate 60 \ --output-ppm-stream - \ --seconds-per-day 0.7 \ +--stop-at-end \ --viewport "1920x1080" \ | \ ffmpeg \ From cfe376605687e94a86c985a7b475085c398668da Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 17:51:03 +0200 Subject: [PATCH 22/31] tweaks --- spcd.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spcd.sh b/spcd.sh index 005dcb6..b0ef37c 100755 --- a/spcd.sh +++ b/spcd.sh @@ -1,8 +1,7 @@ #! /usr/bin/env sh gource \ ---auto-skip-seconds 0.5 \ ---camera-mode "overview" \ +--auto-skip-seconds 0.25 \ --date-format "%Y / %m / %d ⋅ %H : %M : %S" \ --disable-input \ --font-scale 2.5 \ @@ -13,7 +12,7 @@ gource \ --multi-sampling \ --output-framerate 60 \ --output-ppm-stream - \ ---seconds-per-day 0.7 \ +--seconds-per-day 0.6 \ --stop-at-end \ --viewport "1920x1080" \ | \ @@ -24,7 +23,7 @@ ffmpeg \ -i - \ -codec:v libx264 \ -preset veryslow \ --qp 23 \ +-qp 28 \ -movflags \ +faststart \ -pix_fmt yuv420p \ From 1ea1aff7bb9984e3883669597e440df18bfc9c73 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 19:23:59 +0200 Subject: [PATCH 23/31] pkg/clean --- spcd/bootstrap.sh | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 0268849..d0179e9 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -993,17 +993,6 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} # │ f │ pm │ # ╰───┴────╯ -spcd_f_pm_clean() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_run apk cache purge ;; - "${SPCD_PM_APT}") spcd_run apt-get clean ;; - "${SPCD_PM_DNF}") spcd_run dnf clean all ;; - "${SPCD_PM_PACMAN}") spcd_run pacman --sync --clean --noconfirm ;; - "${SPCD_PM_ZYPPER}") spcd_run zypper clean ;; - *) ;; - esac -} - spcd_f_pm_install() { case "${SPCD_PM}" in "${SPCD_PM_APK}") spcd_run apk add "${1}" ;; @@ -1013,7 +1002,7 @@ spcd_f_pm_install() { "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive install "${1}" ;; *) ;; esac - spcd_f_pm_clean + spcd_f_pm_pkg_clean } spcd_f_pm_query() { @@ -1104,6 +1093,21 @@ spcd_f_pm_https_verify() { fi } +# ╭───┬────┬─────╮ +# │ f │ pm │ pkg │ +# ╰───┴────┴─────╯ + +spcd_f_pm_pkg_clean() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_run apk cache purge ;; + "${SPCD_PM_APT}") spcd_run apt-get clean ;; + "${SPCD_PM_DNF}") spcd_run dnf clean all ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --clean --noconfirm ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper clean ;; + *) ;; + esac +} + # ╭───┬─────╮ # │ s │ dns │ # ╰───┴─────╯ From d440c047e77ba562e1952a22d96b2f18fb6c9d89 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 19:24:54 +0200 Subject: [PATCH 24/31] pm --- spcd/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index d0179e9..ee01566 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -989,9 +989,9 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} esac } -# ╭───┬────╮ -# │ f │ pm │ -# ╰───┴────╯ +# ╭───┬──────────────────────╮ +# │ f │ pm = package manager │ +# ╰───┴──────────────────────╯ spcd_f_pm_install() { case "${SPCD_PM}" in From eaa19846b87aa151dc71e3ec6594a7a889fa6948 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 19:26:33 +0200 Subject: [PATCH 25/31] pkg/install --- spcd/bootstrap.sh | 68 +++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index ee01566..4c77035 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -938,7 +938,7 @@ spcd_txt_locales() { spcd_split case "${SPCD_PM}" in "${SPCD_PM_APK}") - spcd_f_pm_install "musl-locales" + spcd_f_pm_pkg_install "musl-locales" export MUSL_LOCPATH="/usr/share/i18n/locales/musl" ;; "${SPCD_PM_APT}") @@ -949,17 +949,17 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} " done spcd_os_write "/etc/locale.gen" "${text}" - spcd_f_pm_install "locales" + spcd_f_pm_pkg_install "locales" ;; "${SPCD_PM_DNF}") local language for name in "${@}"; do language="$(echo "${name}" | cut -d _ -f 1)" - spcd_f_pm_install "glibc-langpack-${language}" + spcd_f_pm_pkg_install "glibc-langpack-${language}" done ;; - "${SPCD_PM_PACMAN}") spcd_f_pm_install "glibc-locales" ;; - "${SPCD_PM_ZYPPER}") spcd_f_pm_install "glibc-locale" ;; + "${SPCD_PM_PACMAN}") spcd_f_pm_pkg_install "glibc-locales" ;; + "${SPCD_PM_ZYPPER}") spcd_f_pm_pkg_install "glibc-locale" ;; *) ;; esac spcd_split @@ -993,18 +993,6 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} # │ f │ pm = package manager │ # ╰───┴──────────────────────╯ -spcd_f_pm_install() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_run apk add "${1}" ;; - "${SPCD_PM_APT}") spcd_run apt-get install --assume-yes "${1}" ;; - "${SPCD_PM_DNF}") spcd_run dnf install --assumeyes "${1}" ;; - "${SPCD_PM_PACMAN}") spcd_run pacman --sync --noconfirm "${1}" ;; - "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive install "${1}" ;; - *) ;; - esac - spcd_f_pm_pkg_clean -} - spcd_f_pm_query() { case "${SPCD_PM}" in "${SPCD_PM_APK}") apk info "${1}" ;; @@ -1108,6 +1096,18 @@ spcd_f_pm_pkg_clean() { esac } +spcd_f_pm_pkg_install() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_run apk add "${1}" ;; + "${SPCD_PM_APT}") spcd_run apt-get install --assume-yes "${1}" ;; + "${SPCD_PM_DNF}") spcd_run dnf install --assumeyes "${1}" ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --noconfirm "${1}" ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive install "${1}" ;; + *) ;; + esac + spcd_f_pm_pkg_clean +} + # ╭───┬─────╮ # │ s │ dns │ # ╰───┴─────╯ @@ -1305,7 +1305,7 @@ Dir::Etc::SourceParts \"\"; spcd_step__packages_install_tools() { spcd_step "Install tools" case "${SPCD_PM}" in - "${SPCD_PM_APT}") spcd_f_pm_install "apt-utils" ;; + "${SPCD_PM_APT}") spcd_f_pm_pkg_install "apt-utils" ;; *) ;; esac } @@ -1327,7 +1327,7 @@ spcd_step__packages_install_locales() { spcd_step__ca_install_package() { spcd_step "Install package" - spcd_f_pm_install "ca-certificates" + spcd_f_pm_pkg_install "ca-certificates" } spcd_step__ca_write_certificates() { @@ -1377,12 +1377,12 @@ spcd_step__ca_update_certificates() { spcd_step__packages_install_dos2unix() { spcd_step "Install dos2unix" - spcd_f_pm_install "dos2unix" + spcd_f_pm_pkg_install "dos2unix" } spcd_step__packages_install_git() { spcd_step "Install Git" - spcd_f_pm_install "git" + spcd_f_pm_pkg_install "git" } # ╭───┬────────╮ @@ -1391,7 +1391,7 @@ spcd_step__packages_install_git() { spcd_step__python_install() { spcd_step "Install package" - spcd_f_pm_install "${SPCD_PYTHON_PACKAGE}" + spcd_f_pm_pkg_install "${SPCD_PYTHON_PACKAGE}" spcd_step "Link alias to command" spcd_python_ln "${SPCD_PYTHON_COMMAND}" # venv @@ -1399,7 +1399,7 @@ spcd_step__python_install() { spcd_step "Install package" case "${SPCD_OS_ID}" in "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") - spcd_f_pm_install "python3-venv" + spcd_f_pm_pkg_install "python3-venv" ;; *) ;; esac @@ -1449,7 +1449,7 @@ spcd_step__install_packages() { spcd_step "EPEL" case "${SPCD_OS_ID}" in "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") - spcd_f_pm_install "epel-release" + spcd_f_pm_pkg_install "epel-release" case "${SPCD_OS_VERSION}" in "9") set -- \ @@ -1481,32 +1481,32 @@ spcd_step__install_packages() { esac # graphviz spcd_step "GraphViz" - spcd_f_pm_install "graphviz" + spcd_f_pm_pkg_install "graphviz" # openssh spcd_step "OpenSSH" case "${SPCD_PM}" in "${SPCD_PM_APK}" | "${SPCD_PM_APT}") - spcd_f_pm_install "openssh-client" + spcd_f_pm_pkg_install "openssh-client" ;; "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}") - spcd_f_pm_install "openssh-clients" + spcd_f_pm_pkg_install "openssh-clients" ;; - "${SPCD_PM_PACMAN}") spcd_f_pm_install "openssh" ;; + "${SPCD_PM_PACMAN}") spcd_f_pm_pkg_install "openssh" ;; *) ;; esac # plantuml spcd_step "PlantUML" - spcd_f_pm_install "plantuml" + spcd_f_pm_pkg_install "plantuml" # rsync spcd_step "Rsync" - spcd_f_pm_install "rsync" + spcd_f_pm_pkg_install "rsync" # shell check spcd_step "ShellCheck" case "${SPCD_PM}" in "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}") - spcd_f_pm_install "ShellCheck" + spcd_f_pm_pkg_install "ShellCheck" ;; - *) spcd_f_pm_install "shellcheck" ;; + *) spcd_f_pm_pkg_install "shellcheck" ;; esac # shfmt spcd_step "ShellFormat" @@ -1515,10 +1515,10 @@ spcd_step__install_packages() { "${SPCD_OS_DEBIAN}") case "${SPCD_OS_VERSION}" in "bullseye") ;; - *) spcd_f_pm_install "shfmt" ;; + *) spcd_f_pm_pkg_install "shfmt" ;; esac ;; - *) spcd_f_pm_install "shfmt" ;; + *) spcd_f_pm_pkg_install "shfmt" ;; esac spcd_step_out } From 14ef58e1fcdf3de3826b248c7d55a2e317e981f2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 19:28:14 +0200 Subject: [PATCH 26/31] pkg/update --- spcd/bootstrap.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 4c77035..2d34e5b 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1004,18 +1004,6 @@ spcd_f_pm_query() { esac } -spcd_f_pm_update() { - spcd_step "Update" - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_run apk update ;; - "${SPCD_PM_APT}") spcd_run apt-get update ;; - "${SPCD_PM_DNF}") spcd_run dnf makecache ;; - "${SPCD_PM_PACMAN}") spcd_run pacman --sync --refresh ;; - "${SPCD_PM_ZYPPER}") spcd_run zypper refresh ;; - *) ;; - esac -} - spcd_f_pm_upgrade() { spcd_step "Upgrade" case "${SPCD_PM}" in @@ -1108,6 +1096,18 @@ spcd_f_pm_pkg_install() { spcd_f_pm_pkg_clean } +spcd_f_pm_pkg_update() { + spcd_step "Update" + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_run apk update ;; + "${SPCD_PM_APT}") spcd_run apt-get update ;; + "${SPCD_PM_DNF}") spcd_run dnf makecache ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --refresh ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper refresh ;; + *) ;; + esac +} + # ╭───┬─────╮ # │ s │ dns │ # ╰───┴─────╯ @@ -1580,7 +1580,7 @@ spcd_main() { spcd_step__packages_set_repositories spcd_step__packages_set_configuration spcd_f_pm_https_trust - spcd_f_pm_update + spcd_f_pm_pkg_update spcd_step__packages_install_tools spcd_step__packages_install_locales spcd_step_out @@ -1593,7 +1593,7 @@ spcd_main() { # packages spcd_step_in "Packages" spcd_f_pm_https_verify - spcd_f_pm_update + spcd_f_pm_pkg_update spcd_f_pm_upgrade spcd_step__packages_install_dos2unix spcd_step__packages_install_git From 8d86912ab1a4bddd9d62c4188eefe89f2866e54f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 19:29:47 +0200 Subject: [PATCH 27/31] pkg/upgrade --- spcd/bootstrap.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 2d34e5b..09fe8f7 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1004,18 +1004,6 @@ spcd_f_pm_query() { esac } -spcd_f_pm_upgrade() { - spcd_step "Upgrade" - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_run apk upgrade ;; - "${SPCD_PM_APT}") spcd_run apt-get upgrade --assume-yes ;; - "${SPCD_PM_DNF}") spcd_run dnf upgrade --assumeyes ;; - "${SPCD_PM_PACMAN}") spcd_run pacman --sync --sysupgrade --noconfirm ;; - "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive update ;; - *) ;; - esac -} - # ╭───┬────┬───────╮ # │ f │ pm │ https │ # ╰───┴────┴───────╯ @@ -1108,6 +1096,18 @@ spcd_f_pm_pkg_update() { esac } +spcd_f_pm_pkg_upgrade() { + spcd_step "Upgrade" + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_run apk upgrade ;; + "${SPCD_PM_APT}") spcd_run apt-get upgrade --assume-yes ;; + "${SPCD_PM_DNF}") spcd_run dnf upgrade --assumeyes ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --sysupgrade --noconfirm ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive update ;; + *) ;; + esac +} + # ╭───┬─────╮ # │ s │ dns │ # ╰───┴─────╯ @@ -1594,7 +1594,7 @@ spcd_main() { spcd_step_in "Packages" spcd_f_pm_https_verify spcd_f_pm_pkg_update - spcd_f_pm_upgrade + spcd_f_pm_pkg_upgrade spcd_step__packages_install_dos2unix spcd_step__packages_install_git spcd_step_out From 794abeb3512aab01c79cd6ba05768e1a3ae5f2f2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 19:36:55 +0200 Subject: [PATCH 28/31] pkg/query --- spcd/bootstrap.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 09fe8f7..f4c2c03 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -993,17 +993,6 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} # │ f │ pm = package manager │ # ╰───┴──────────────────────╯ -spcd_f_pm_query() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") apk info "${1}" ;; - "${SPCD_PM_APT}") dpkg-query --show "${1}" ;; - "${SPCD_PM_DNF}") rpm --query "${1}" ;; - "${SPCD_PM_PACMAN}") pacman --query "${1}" ;; - "${SPCD_PM_ZYPPER}") rpm --query "${1}" ;; - *) ;; - esac -} - # ╭───┬────┬───────╮ # │ f │ pm │ https │ # ╰───┴────┴───────╯ @@ -1084,6 +1073,17 @@ spcd_f_pm_pkg_install() { spcd_f_pm_pkg_clean } +spcd_f_pm_pkg_query() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") apk info "${1}" ;; + "${SPCD_PM_APT}") dpkg-query --show "${1}" ;; + "${SPCD_PM_DNF}") rpm --query "${1}" ;; + "${SPCD_PM_PACMAN}") pacman --query "${1}" ;; + "${SPCD_PM_ZYPPER}") rpm --query "${1}" ;; + *) ;; + esac +} + spcd_f_pm_pkg_update() { spcd_step "Update" case "${SPCD_PM}" in From acae6216d0325c754af39fb298e565a16aee2742 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 19:39:30 +0200 Subject: [PATCH 29/31] mv --- spcd/bootstrap.sh | 242 +++++++++++++++++++++++----------------------- 1 file changed, 123 insertions(+), 119 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index f4c2c03..e2913d6 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -836,6 +836,129 @@ spcd_python_pip() { fi } +# ╭───┬──────────────────────╮ +# │ f │ pm = package manager │ +# ╰───┴──────────────────────╯ + +# ╭───┬────┬───────╮ +# │ f │ pm │ https │ +# ╰───┴────┴───────╯ + +spcd_f_pm_https_path() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") echo "/etc/apk/repositories.d/https" ;; + "${SPCD_PM_APT}") echo "/etc/apt/apt.conf.d/https" ;; + "${SPCD_PM_DNF}") echo "/etc/dnf/dnf.conf.d/https.conf" ;; + "${SPCD_PM_PACMAN}") echo "/etc/pacman.d/https.conf" ;; + "${SPCD_PM_ZYPPER}") ;; + *) ;; + esac +} + +spcd_f_pm_https_trust() { + spcd_step "Trust" + local path text + if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then + path="$(spcd_f_pm_https_path)" + if [ -n "${path}" ]; then + spcd_os_mkdir "$(dirname "${path}")" + case "${SPCD_PM}" in + "${SPCD_PM_APK}") text="\ +--no-verify +" ;; + "${SPCD_PM_APT}") text="\ +Acquire::https::Verify-Peer False; +" ;; + "${SPCD_PM_DNF}") text="\ +sslverify=False +" ;; + "${SPCD_PM_PACMAN}") text="\ +SSLVerify = No +" ;; + "${SPCD_PM_ZYPPER}") ;; + *) ;; + esac + [ -n "${text}" ] && + spcd_os_write "${path}" "${text}" + fi + fi +} + +spcd_f_pm_https_verify() { + spcd_step "Verify" + local path + path="$(spcd_f_pm_https_path)" + if [ -n "${path}" ]; then + spcd_os_rm "${path}" + fi +} + +# ╭───┬────┬─────╮ +# │ f │ pm │ pkg │ +# ╰───┴────┴─────╯ + +spcd_f_pm_pkg_clean() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_run apk cache purge ;; + "${SPCD_PM_APT}") spcd_run apt-get clean ;; + "${SPCD_PM_DNF}") spcd_run dnf clean all ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --clean --noconfirm ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper clean ;; + *) ;; + esac +} + +spcd_f_pm_pkg_install() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_run apk add "${1}" ;; + "${SPCD_PM_APT}") spcd_run apt-get install --assume-yes "${1}" ;; + "${SPCD_PM_DNF}") spcd_run dnf install --assumeyes "${1}" ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --noconfirm "${1}" ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive install "${1}" ;; + *) ;; + esac + spcd_f_pm_pkg_clean +} + +spcd_f_pm_pkg_query() { + case "${SPCD_PM}" in + "${SPCD_PM_APK}") apk info "${1}" ;; + "${SPCD_PM_APT}") dpkg-query --show "${1}" ;; + "${SPCD_PM_DNF}") rpm --query "${1}" ;; + "${SPCD_PM_PACMAN}") pacman --query "${1}" ;; + "${SPCD_PM_ZYPPER}") rpm --query "${1}" ;; + *) ;; + esac +} + +spcd_f_pm_pkg_update() { + spcd_step "Update" + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_run apk update ;; + "${SPCD_PM_APT}") spcd_run apt-get update ;; + "${SPCD_PM_DNF}") spcd_run dnf makecache ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --refresh ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper refresh ;; + *) ;; + esac +} + +spcd_f_pm_pkg_upgrade() { + spcd_step "Upgrade" + case "${SPCD_PM}" in + "${SPCD_PM_APK}") spcd_run apk upgrade ;; + "${SPCD_PM_APT}") spcd_run apt-get upgrade --assume-yes ;; + "${SPCD_PM_DNF}") spcd_run dnf upgrade --assumeyes ;; + "${SPCD_PM_PACMAN}") spcd_run pacman --sync --sysupgrade --noconfirm ;; + "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive update ;; + *) ;; + esac +} + +# ╭───┬─────╮ +# │ f │ txt │ +# ╰───┴─────╯ + spcd_txt_locale() { local action="${1}" local chosen="${2}" @@ -989,125 +1112,6 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} esac } -# ╭───┬──────────────────────╮ -# │ f │ pm = package manager │ -# ╰───┴──────────────────────╯ - -# ╭───┬────┬───────╮ -# │ f │ pm │ https │ -# ╰───┴────┴───────╯ - -spcd_f_pm_https_path() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") echo "/etc/apk/repositories.d/https" ;; - "${SPCD_PM_APT}") echo "/etc/apt/apt.conf.d/https" ;; - "${SPCD_PM_DNF}") echo "/etc/dnf/dnf.conf.d/https.conf" ;; - "${SPCD_PM_PACMAN}") echo "/etc/pacman.d/https.conf" ;; - "${SPCD_PM_ZYPPER}") ;; - *) ;; - esac -} - -spcd_f_pm_https_trust() { - spcd_step "Trust" - local path text - if [ -n "${SPCD_CA_1}" ] || [ "${SPCD_PM}" = "${SPCD_PM_APT}" ]; then - path="$(spcd_f_pm_https_path)" - if [ -n "${path}" ]; then - spcd_os_mkdir "$(dirname "${path}")" - case "${SPCD_PM}" in - "${SPCD_PM_APK}") text="\ ---no-verify -" ;; - "${SPCD_PM_APT}") text="\ -Acquire::https::Verify-Peer False; -" ;; - "${SPCD_PM_DNF}") text="\ -sslverify=False -" ;; - "${SPCD_PM_PACMAN}") text="\ -SSLVerify = No -" ;; - "${SPCD_PM_ZYPPER}") ;; - *) ;; - esac - [ -n "${text}" ] && - spcd_os_write "${path}" "${text}" - fi - fi -} - -spcd_f_pm_https_verify() { - spcd_step "Verify" - local path - path="$(spcd_f_pm_https_path)" - if [ -n "${path}" ]; then - spcd_os_rm "${path}" - fi -} - -# ╭───┬────┬─────╮ -# │ f │ pm │ pkg │ -# ╰───┴────┴─────╯ - -spcd_f_pm_pkg_clean() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_run apk cache purge ;; - "${SPCD_PM_APT}") spcd_run apt-get clean ;; - "${SPCD_PM_DNF}") spcd_run dnf clean all ;; - "${SPCD_PM_PACMAN}") spcd_run pacman --sync --clean --noconfirm ;; - "${SPCD_PM_ZYPPER}") spcd_run zypper clean ;; - *) ;; - esac -} - -spcd_f_pm_pkg_install() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_run apk add "${1}" ;; - "${SPCD_PM_APT}") spcd_run apt-get install --assume-yes "${1}" ;; - "${SPCD_PM_DNF}") spcd_run dnf install --assumeyes "${1}" ;; - "${SPCD_PM_PACMAN}") spcd_run pacman --sync --noconfirm "${1}" ;; - "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive install "${1}" ;; - *) ;; - esac - spcd_f_pm_pkg_clean -} - -spcd_f_pm_pkg_query() { - case "${SPCD_PM}" in - "${SPCD_PM_APK}") apk info "${1}" ;; - "${SPCD_PM_APT}") dpkg-query --show "${1}" ;; - "${SPCD_PM_DNF}") rpm --query "${1}" ;; - "${SPCD_PM_PACMAN}") pacman --query "${1}" ;; - "${SPCD_PM_ZYPPER}") rpm --query "${1}" ;; - *) ;; - esac -} - -spcd_f_pm_pkg_update() { - spcd_step "Update" - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_run apk update ;; - "${SPCD_PM_APT}") spcd_run apt-get update ;; - "${SPCD_PM_DNF}") spcd_run dnf makecache ;; - "${SPCD_PM_PACMAN}") spcd_run pacman --sync --refresh ;; - "${SPCD_PM_ZYPPER}") spcd_run zypper refresh ;; - *) ;; - esac -} - -spcd_f_pm_pkg_upgrade() { - spcd_step "Upgrade" - case "${SPCD_PM}" in - "${SPCD_PM_APK}") spcd_run apk upgrade ;; - "${SPCD_PM_APT}") spcd_run apt-get upgrade --assume-yes ;; - "${SPCD_PM_DNF}") spcd_run dnf upgrade --assumeyes ;; - "${SPCD_PM_PACMAN}") spcd_run pacman --sync --sysupgrade --noconfirm ;; - "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive update ;; - *) ;; - esac -} - # ╭───┬─────╮ # │ s │ dns │ # ╰───┴─────╯ From ec14e2ae72553812b531907b7fef0c7ec7c0bbac Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 19:41:26 +0200 Subject: [PATCH 30/31] txt/locales --- spcd/bootstrap.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index e2913d6..2c301e0 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -1007,7 +1007,7 @@ spcd_txt_locale() { if [ "${name}" != "LANGUAGE" ]; then export "${name}=${long}" else - export "${name}=$(spcd_txt_locales language "${chosen}")" + export "${name}=$(spcd_f_txt_locales language "${chosen}")" fi done spcd_split @@ -1048,7 +1048,7 @@ spcd_txt_locale() { esac } -spcd_txt_locales() { +spcd_f_txt_locales() { local action="${1}" local chosen="${2}" set -- \ @@ -1057,7 +1057,7 @@ spcd_txt_locales() { local name case "${action}" in "install") - spcd_txt_locales "list" + spcd_f_txt_locales "list" spcd_split case "${SPCD_PM}" in "${SPCD_PM_APK}") @@ -1086,7 +1086,7 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} *) ;; esac spcd_split - spcd_txt_locales "list" + spcd_f_txt_locales "list" ;; "language") local text @@ -1317,7 +1317,7 @@ spcd_step__packages_install_tools() { spcd_step__packages_install_locales() { spcd_step_in "Locales" spcd_step "Install" - spcd_txt_locales "install" + spcd_f_txt_locales "install" spcd_step "Set" spcd_txt_locale "set" "${SPCD_TXT_LOCALE}" spcd_step "Show" From ca5de693dc18a80ad8ce26f528d50ab114fe04cf Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 8 Sep 2024 19:42:49 +0200 Subject: [PATCH 31/31] txt/locale --- spcd/bootstrap.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 2c301e0..b6eaf31 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -959,7 +959,7 @@ spcd_f_pm_pkg_upgrade() { # │ f │ txt │ # ╰───┴─────╯ -spcd_txt_locale() { +spcd_f_txt_locale() { local action="${1}" local chosen="${2}" set -- \ @@ -994,7 +994,7 @@ spcd_txt_locale() { fi ;; "set") - spcd_txt_locale "list" + spcd_f_txt_locale "list" spcd_split local locale long if [ -n "${chosen}" ]; then @@ -1011,7 +1011,7 @@ spcd_txt_locale() { fi done spcd_split - spcd_txt_locale "list" + spcd_f_txt_locale "list" ;; "show") local regex @@ -1319,9 +1319,9 @@ spcd_step__packages_install_locales() { spcd_step "Install" spcd_f_txt_locales "install" spcd_step "Set" - spcd_txt_locale "set" "${SPCD_TXT_LOCALE}" + spcd_f_txt_locale "set" "${SPCD_TXT_LOCALE}" spcd_step "Show" - spcd_txt_locale "show" + spcd_f_txt_locale "show" spcd_step_out }