diff --git a/scripts/Arch/OS/setup.sh b/scripts/Arch/OS/setup.sh index b1218689..f72abcd1 100755 --- a/scripts/Arch/OS/setup.sh +++ b/scripts/Arch/OS/setup.sh @@ -8,7 +8,7 @@ ARCH_MOUNT_ROOT="${ARCH_MOUNT_ROOT:-"/mnt"}"; ARCH_LANG="${ARCH_LANG:-"en_US.UTF-8"}"; ARCH_KEYMAP="${ARCH_KEYMAP:-"de_CH-latin1"}"; ARCH_X11_KEYMAP="${ARCH_X11_KEYMAP:-"ch"}"; -LOCALE_PATTERN="${LOCALE_PATTERN:-"\(de_CH\|en_US\)"}"; +LOCALE_PATTERN="${LOCALE_PATTERN:-\(de_CH\|en_US\)}"; USER_NAME="${USER_NAME:-"manuel"}"; USER_DISPLAYNAME="${USER_DISPLAYNAME}"; @@ -41,7 +41,7 @@ arch-chroot "$ARCH_MOUNT_ROOT" systemctl enable NetworkManager; arch-chroot "$ARCH_MOUNT_ROOT" ln -sf /usr/share/zoneinfo/Europe/Zurich /etc/localtime; arch-chroot "$ARCH_MOUNT_ROOT" hwclock --systohc; -arch-chroot "$ARCH_MOUNT_ROOT" sed -i "s/#$LOCALE_PATTERN/\1/" /etc/locale.gen; +arch-chroot "$ARCH_MOUNT_ROOT" sed -i "s/^#\?\($LOCALE_PATTERN.*\)$/\1/" /etc/locale.gen; arch-chroot "$ARCH_MOUNT_ROOT" locale-gen; echo "LANG=$ARCH_LANG" | arch-chroot "$ARCH_MOUNT_ROOT" tee /etc/locale.conf > /dev/null; echo "KEYMAP=$ARCH_KEYMAP" | arch-chroot "$ARCH_MOUNT_ROOT" tee /etc/vconsole.conf > /dev/null;