teldra
/
vinstaller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

progress

This commit is contained in:
teldra 2022-02-09 10:41:57 +01:00
parent 2e7492eb38
commit f2dd89dea5
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/base
View File

@ -15,11 +15,13 @@ sed -i "/FONT=/s/^#//g" /etc/rc.conf
echo "LANG=en_US.UTF-8" > /etc/locale.conf
echo "en_US.UTF-8 UTF-8" >> /etc/default/libc-locales
if ! [ "$LANGUAGE" == "en" ]; then
if ! [ "${LANGUAGE_}" == "en" ]; then
echo "${L1}.UTF-8 UTF-8" >> /etc/default/libc-locales
fi
echo "KEYMAP=${L2}" > /etc/vconsole.conf
if ! [ "${KEY_LANG}" == "en" ]; then
echo "KEYMAP=${L2}" > /etc/vconsole.conf
fi
xbps-reconfigure -f glibc-locales
@ -98,9 +100,11 @@ echo "#ignorepkg=linux-firmware-broadcom";
echo "#ignorepkg=wifi-firmware"; } >> /etc/xbps.d/10-ignore-firmware.conf
chmod 755 /etc/xbps.d/10-ignore-firmware.conf
cp -a /etc/profile.d/locale.sh /etc/profile.d/zz-locale-user.sh
sed -i 's/locale.conf/locale-user.conf/' /etc/profile.d/zz-locale-user.sh
sed -i '/^if/i [ "$(id -u)" -eq 0 ] && return' /etc/profile.d/zz-locale-user.sh
if ! [ "${LANGUAGE_}" == "en" ]; then
cp -a /etc/profile.d/locale.sh /etc/profile.d/zz-locale-user.sh
sed -i 's/locale.conf/locale-user.conf/' /etc/profile.d/zz-locale-user.sh
sed -i '/^if/i [ "$(id -u)" -eq 0 ] && return' /etc/profile.d/zz-locale-user.sh
fi
echo '0 * * * * /usr/bin/void-snapshot cron #void.system' > /var/spool/cron/root

2
etc/profile/gnome
View File

@ -26,7 +26,7 @@ packages() {
config() {
enable_service dbus gdm
if ! [ "$LANGUAGE" == "en" ]; then
if ! [ "$LANGUAGE_" == "en" ]; then
echo "export LANG=${L1}.UTF-8" > /etc/sv/gdm/conf
fi
}

8
etc/xserver/x11
View File

@ -1,8 +1,8 @@
packages() {
if [ "${LANGUAGE}" == "en" ]; then
if [ "${LANGUAGE_}" == "en" ]; then
lang=${L1//_/-}
else
lang="${LANGUAGE}"
lang="${LANGUAGE_}"
fi
addpkg xorg-minimal xorg-apps xorg-fonts dbus noto-fonts-emoji mesa-dri vulkan-loader
addpkg "firefox-i18n-${lang}"
@ -11,7 +11,7 @@ packages() {
addpkg element-desktop
addpkg vlc yt-dlp
addpkg alsa-utils
addpkg "aspell-${LANGUAGE}" gspell
addpkg "aspell-${LANGUAGE_}" gspell
addpkg ${email} ${terminal} ${imageviewer} ${pdf} ${filemanager} ${archiver} ${screenshot} ${calc} ${pinentry} ${keyring} ${gpg} ${policykit} ${sshaskpass} ${partmanager} ${dm} ${de} ${misc}
@ -32,7 +32,7 @@ config() {
echo " Option \"XkbLayout\" \"de\"";
echo " Option \"XkbVariant\" \"nodeadkeys\"";
echo " #Option \"XkbOptions\" \"grp:alt_shift_toggle\"";
echo "EndSection"; } > /etc/X11/xorg.conf.d/10-keyboard.conf
echo "EndSection"; } > /etc/X11/xorg.conf.d/00-keyboard.conf
fi
ln -s /usr/bin/yt-dlp /usr/local/bin/youtube-dl

1
files/bash/xbps-aliase.sh
View File

@ -2,6 +2,7 @@
alias xu="sudo void-update"
alias xr="sudo xbps-remove -R"
alias xs="xbps-query -Rs"
alias xq="xbps-query"
alias backup="sudo void-backup"
alias snapshot="sudo void-snapshot"

6
main.sh
View File

@ -225,9 +225,9 @@ printing() {
lang() {
header "Language"
multiplechoice "de" "en"
LANGUAGE="${output}"
LANGUAGE_="${output}"
L1="en_US"
if [ "${LANGUAGE}" == "de" ]; then
if [ "${LANGUAGE_}" == "de" ]; then
L1="de_DE"
fi
}
@ -278,7 +278,7 @@ do_chroot() {
echo "PASS=${PASS}" >> "${vars}"
echo "HOSTNAME=${HOSTNAME}" >> "${vars}"
echo "EFI=${EFI}" >> "${vars}"
echo "LANGUAGE=${LANGUAGE}" >> "${vars}"
echo "LANGUAGE_=${LANGUAGE_}" >> "${vars}"
echo "L1=${L1}" >> "${vars}"
echo "L2=${L2}" >> "${vars}"
echo "TARGET_PHY_ID=${TARGET_PHY_ID}" >> "${vars}"