simono41/SpectreOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix online install

Browse source
This commit is contained in:
Simon Rieger 2023-02-17 15:46:13 +01:00
parent 0a9f98e808
commit 3bae12b6d6
4 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch-graphical-install-auto.sh
View file

@ -592,16 +592,16 @@ if ! [ -f "/usr/bin/l" ]; then
ln -s /usr/bin/ls /usr/bin/l ln -s /usr/bin/ls /usr/bin/l
fi fi
su ${user} -c "chezmoi init --apply https://git.brothertec.eu/simono41/dotfiles.git" su ${user} -l -c "chezmoi init --apply https://git.brothertec.eu/simono41/dotfiles.git"
su ${user} -c "chezmoi update -v" su ${user} -l -c "chezmoi update -v"
# https://aur.archlinux.org/packages/ttf-font-nerd-dummy # 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), # 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), # 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. # 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 #if pacman -Rdd ttf-iosevka-nerd --noconfirm; then
aurinstaller ttf-font-nerd-dummy # aurinstaller ttf-font-nerd-dummy
fi #fi
#aurinstaller conky-lua-nv #aurinstaller conky-lua-nv
#aurinstaller passdmenu #aurinstaller passdmenu

5
arch-install.sh
View file

@ -38,7 +38,7 @@ echo "Logged in as root"
function minimalinstallation() { function minimalinstallation() {
cp -v /opt/${repo}/mirrorlist* /etc/pacman.d/ 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 # hooks
cp -v /opt/${repo}/configs/install/* ${mountpoint}/usr/lib/initcpio/install/ 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 cp /opt/${repo}/scripts/update.sh ${mountpoint}/usr/bin/update-script
chmod +x ${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 if ! arch-chroot ${mountpoint} /usr/bin/update-script; then
echo "Aktualisierung nicht erfolgreich!!!" echo "Aktualisierung nicht erfolgreich!!!"
fi fi

1
packages.txt
View file

@ -10,6 +10,7 @@ mosh mitmproxy
libva-intel-driver intel-media-driver org.freedesktop.secrets gnome-keyring 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 libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau libvdpau-va-gl
openscad prusa-slicer slicer-udev openscad prusa-slicer slicer-udev
man man-pages man-pages-de
libheif libheif
at-spi2-core at-spi2-core
python-atspi python-atspi

5
scripts/update.sh
View file

@ -19,7 +19,12 @@ arch=$(uname -m)
branch=master branch=master
# Aktualisiere die Repositiories # Aktualisiere die Repositiories
if [ -f "/opt/${repo}/repo.sh" ]; then
/opt/${repo}/repo.sh /opt/${repo}/repo.sh
else
/usr/bin/repo-script
fi
source /etc/environment
if [ -d "/opt/${repo}" ]; then if [ -d "/opt/${repo}" ]; then
echo "${repo} existiert bereits!!!" echo "${repo} existiert bereits!!!"