manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Improve setup script

Browse source
This commit is contained in:
Manuel Thalmann 2023-04-03 10:21:27 +02:00
parent f06acc1316
commit 70abbbaeed
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/Arch/OS/setup.sh
View file

@ -9,6 +9,13 @@ ARCH_LANG="en_US.UTF-8";
ARCH_KEYMAP="de_CH-latin1"; ARCH_KEYMAP="de_CH-latin1";
LOCALE_PATTERN="\(de_CH\|en_US\)"; LOCALE_PATTERN="\(de_CH\|en_US\)";
projectRoot="$(realpath ../../..)";
projectName="$(basename "$projectRoot")";
relativeDir="$(realpath --relative-to "$projectRoot" "$(pwd)")";
tempRoot="/root/$(basename "$projectName")";
cp -r "$projectRoot"; "${ARCH_MOUNT_ROOT}$tempRoot";
tempDir="$tempRoot/$relativeDir";
loadkeys "$ARCH_KEYMAP"; loadkeys "$ARCH_KEYMAP";
timedatectl set-timezone "$ARCH_TIMEZONE"; timedatectl set-timezone "$ARCH_TIMEZONE";
. "./partition.sh"; . "./partition.sh";
@ -29,11 +36,7 @@ arch-chroot "$ARCH_MOUNT_ROOT" mkinitcpio -P;
echo "Please choose a password for the user \`root\`"; echo "Please choose a password for the user \`root\`";
arch-chroot "$ARCH_MOUNT_ROOT" passwd; arch-chroot "$ARCH_MOUNT_ROOT" passwd;
dir="$(realpath ../../..)"; arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/GRUB/install.sh";
scriptRoot="$(realpath --relative-to "$dir" "$(pwd)")"; arch-chroot "$ARCH_MOUNT_ROOT" rm -rf "$tempRoot";
tempDir="/root/$(basename "$dir")";
cp -r "$dir" "$ARCH_MOUNT_ROOT/root/";
arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/$scriptRoot/../Software/GRUB/install.sh";
arch-chroot "$ARCH_MOUNT_ROOT" rm -rf "$tempDir";
popd > /dev/null; popd > /dev/null;