Compare commits

..

No commits in common. "7c181c84fb39f08fdc7d8a845b4ac269fc1045dd" and "e5dc67404064b660bcac2f0095e99e33c27e2fe1" have entirely different histories.

2 changed files with 69 additions and 59 deletions

View file

@ -222,6 +222,13 @@ Handle project workflows in a unified way:
#### Shell #### Shell
* comment * comment
* display locales
* default
* available
* effective
* selected
* available
* effective
* handle errors * handle errors
* packages * packages
* configure * configure

View file

@ -200,51 +200,62 @@ _spcd_txt_pick() {
# ╰───────────╯ # ╰───────────╯
spcd_ca() { spcd_ca() {
local grep="\(After\|Before\|Issuer\|Signature Algorithm\|Subject:\)"
local index name value local index name value
local grep="\(After\|Before\|Issuer\|Signature Algorithm\|Subject:\)"
case "${1}" in
"list")
while true; do
index=$((index + 1))
name="SPCD_CA_${index}"
eval "value=\"\${${name}}\""
[ -n "${value}" ] || break
echo "${name} ="
echo "${value}" |
openssl x509 -noout -text |
grep "${grep}"
done
;;
"write")
local root="${2}" local root="${2}"
while true; do while true; do
index=$((index + 1)) index=$((index + 1))
name="SPCD_CA_${index}" name="SPCD_CA_${index}"
eval "value=\"\${${name}}\"" eval "value=\"\${${name}}\""
[ -n "${value}" ] || break [ -n "${value}" ] || break
case "${1}" in
"list")
echo "${name} ="
echo "${value}" |
openssl x509 -noout -text |
grep "${grep}"
;;
"write")
spcd_os_write "${root}/${index}.crt" "${value}" spcd_os_write "${root}/${index}.crt" "${value}"
done
;; ;;
*) ;; *) ;;
esac esac
done
} }
spcd_dns() { spcd_dns() {
local index name text value local index name value
case "${1}" in
"list")
while true; do while true; do
index=$((index + 1)) index=$((index + 1))
name="SPCD_DNS_${index}" name="SPCD_DNS_${index}"
eval "value=\"\${${name}}\"" eval "value=\"\${${name}}\""
[ -n "${value}" ] || break [ -n "${value}" ] || break
case "${1}" in
"list")
spcd_os_printenv "${name}" spcd_os_printenv "${name}"
done
;; ;;
"write") "write")
local text
while true; do
index=$((index + 1))
name="SPCD_DNS_${index}"
eval "value=\"\${${name}}\""
[ -n "${value}" ] || break
text="${text}\ text="${text}\
nameserver ${value} nameserver ${value}
" "
done
spcd_os_write "/etc/resolv.conf" "${text}"
;; ;;
*) ;; *) ;;
esac esac
done
if [ "${1}" = "write" ]; then
spcd_os_write "/etc/resolv.conf" "${text}"
fi
} }
# ╭───────────┬───────╮ # ╭───────────┬───────╮
@ -378,9 +389,8 @@ spcd_txt_get() {
} }
spcd_txt_locale() { spcd_txt_locale() {
locale
spcd_split
local value name local value name
locale
if [ -n "${1}" ]; then if [ -n "${1}" ]; then
value="${1}" value="${1}"
else else
@ -408,48 +418,41 @@ spcd_txt_locale() {
locale locale
} }
spcd_txt_locales_echo() {
case "${1}" in
"LANGUAGE") spcd_os_printenv "LANGUAGE" ;;
*) locale -a ;;
esac
}
spcd_txt_locales() { spcd_txt_locales() {
set -- \ set -- \
"${SPCD_TXT_LOCALE_ENGLISH}" \ "${SPCD_TXT_LOCALE_ENGLISH}" \
"${SPCD_TXT_LOCALE_FRENCH}" "${SPCD_TXT_LOCALE_FRENCH}"
local language locale text local locale
spcd_txt_locales_echo
spcd_split
for locale in "${@}"; do
case "${1}" in case "${1}" in
"glibc-langpack-") "glibc-langpack-")
local language
for locale in "${@}"; do
language="$(echo "${locale}" | cut -d _ -f 1)" language="$(echo "${locale}" | cut -d _ -f 1)"
spcd_install_package "glibc-langpack-${language}" spcd_install_package "glibc-langpack-${language}"
done
;; ;;
"LANGUAGE") "LANGUAGE")
local text
for locale in "${@}"; do
if [ -n "${text}" ]; then if [ -n "${text}" ]; then
text="${text}:${locale}" text="${text}:${locale}"
else else
text="${locale}" text="${locale}"
fi fi
done
export LANGUAGE="${text}"
;; ;;
"locale.gen") "locale.gen")
local text
for locale in "${@}"; do
text="${text}\ text="${text}\
${locale}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET} ${locale}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET}
" "
done
spcd_os_write "/etc/locale.gen" "${text}"
;; ;;
*) ;; *) ;;
esac esac
done
case "${1}" in
"LANGUAGE") export LANGUAGE="${text}" ;;
"locale.gen") spcd_os_write "/etc/locale.gen" "${text}" ;;
*) ;;
esac
spcd_split
spcd_txt_locales_echo
} }
# ╭──────╮ # ╭──────╮