This commit is contained in:
teldra 2021-03-12 14:35:49 +01:00
parent 2d36b4cb7b
commit 678edac95a
5 changed files with 7 additions and 2 deletions

3
apps/firefox Normal file
View File

@ -0,0 +1,3 @@
if [[ "${cfg[lang]}" == "de_DE" ]]; then
addpkg firefox-i18n-de
fi

View File

@ -107,6 +107,7 @@ setconf() {
addpkg() {
local input=( ${@} )
for i in $(seq 0 "$(( ${#input[@]} - 1 ))"); do
test -f "${apps}"/"${input[$i]}" && source "${apps}"/"${input[$i]}"
pkg+=( "${input[$i]}" )
#echo "pkg+=( \"${input[$i]}\" )" >> "${vars}/pkg"
done

View File

@ -9,6 +9,7 @@ install_mods="${modules}/install"
chroot_mods="${modules}/chroot"
vars="${wrksrc}/vars"
dest="${wrksrc}/dest"
apps="${dir}/apps"
rm -rf "${vars}"
mkdir -p "${wrksrc}" "${vars}" "${dest}"
declare -A cfg=()

View File

@ -30,6 +30,7 @@ done
source "${modules}"/40-"${modulename}"/langs/"${lang_tmp}".mod
addpkg base-system void-repo-multilib void-repo-multilib-nonfree void-repo-nonfree btrfs-progs lvm2 cronie socklog-void ntp xtools sudo wireguard-tools gnupg2 progress pwgen net-tools ncdu nmap mtr ioping iotop hdparm smartmontools htop git
ignorepkg nvi
servicesenable acpid cronie socklog-unix nanoklogd uuidd
servicesdisable agetty-tty6 agetty-tty5

View File

@ -13,9 +13,8 @@ if [[ ! "${cfg[soundsystem]}" == "none" ]]; then
fi
if [[ ! "${cfg[de]}" == "none" ]]; then
addpkg "firefox" "firefox-i18n-de" "browserpass" "vlc" "avahi"
addpkg "firefox"
servicesdisable "acpid"
servicesenable "avahi-daemon"
test -f "${modules}"/de.d/pre/de/"${cfg[de]}".mod && source "${modules}"/de.d/pre/de/"${cfg[de]}".mod
test -f "${modules}"/de.d/pre/system/"${cfg[gfx_system]}".mod && source "${modules}"/de.d/pre/system/"${cfg[gfx_system]}".mod
test -f "${modules}"/de.d/pre/gfx/"${cfg[gfx_hardware]}".mod && source "${modules}"/de.d/pre/gfx/"${cfg[gfx_hardware]}".mod