diff --git a/arch-graphical-install-auto.sh b/arch-graphical-install-auto.sh index 03301bd..dcb9a7d 100755 --- a/arch-graphical-install-auto.sh +++ b/arch-graphical-install-auto.sh @@ -592,16 +592,16 @@ if ! [ -f "/usr/bin/l" ]; then ln -s /usr/bin/ls /usr/bin/l fi -su ${user} -c "chezmoi init --apply https://git.brothertec.eu/simono41/dotfiles.git" -su ${user} -c "chezmoi update -v" +su ${user} -l -c "chezmoi init --apply https://git.brothertec.eu/simono41/dotfiles.git" +su ${user} -l -c "chezmoi update -v" # https://aur.archlinux.org/packages/ttf-font-nerd-dummy # I was going to delete it because at the moment the only package that provides ttf-font-nerd is ttf-iosevka-nerd (see this search entry), # if ttf-iosevka-nerd no longer provides ttf-font-nerd (which can be a possible fix to bug #74050), # this AUR package will be the only package that provides ttf-font-nerd, in which case it is better deleted. -if pacman -Rdd ttf-iosevka-nerd --noconfirm; then - aurinstaller ttf-font-nerd-dummy -fi +#if pacman -Rdd ttf-iosevka-nerd --noconfirm; then +# aurinstaller ttf-font-nerd-dummy +#fi #aurinstaller conky-lua-nv #aurinstaller passdmenu diff --git a/arch-install.sh b/arch-install.sh index 9e667db..0baba34 100755 --- a/arch-install.sh +++ b/arch-install.sh @@ -38,7 +38,7 @@ echo "Logged in as root" function minimalinstallation() { cp -v /opt/${repo}/mirrorlist* /etc/pacman.d/ - pacstrap -c -d -G -C /opt/${repo}/pacman.conf -M ${mountpoint} $(cat /opt/${repo}/packages.txt) + pacstrap -G -C /opt/${repo}/pacman.conf -M ${mountpoint} $(cat /opt/${repo}/packages.txt) # hooks cp -v /opt/${repo}/configs/install/* ${mountpoint}/usr/lib/initcpio/install/ @@ -53,6 +53,9 @@ function minimalinstallation() { cp /opt/${repo}/scripts/update.sh ${mountpoint}/usr/bin/update-script chmod +x ${mountpoint}/usr/bin/update-script + cp /opt/${repo}/repo.sh ${mountpoint}/usr/bin/repo-script + chmod +x ${mountpoint}/usr/bin/repo-script + if ! arch-chroot ${mountpoint} /usr/bin/update-script; then echo "Aktualisierung nicht erfolgreich!!!" fi diff --git a/packages.txt b/packages.txt index d13e91d..b4298e9 100644 --- a/packages.txt +++ b/packages.txt @@ -10,6 +10,7 @@ mosh mitmproxy libva-intel-driver intel-media-driver org.freedesktop.secrets gnome-keyring libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau libvdpau-va-gl openscad prusa-slicer slicer-udev +man man-pages man-pages-de libheif at-spi2-core python-atspi diff --git a/scripts/update.sh b/scripts/update.sh index 532a248..b95836e 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -19,7 +19,12 @@ arch=$(uname -m) branch=master # Aktualisiere die Repositiories -/opt/${repo}/repo.sh +if [ -f "/opt/${repo}/repo.sh" ]; then + /opt/${repo}/repo.sh +else + /usr/bin/repo-script +fi +source /etc/environment if [ -d "/opt/${repo}" ]; then echo "${repo} existiert bereits!!!"