diff options
6 files changed, 20 insertions, 7 deletions
diff --git a/.forgejo/workflows/build-theme-send-core-repo.yml b/.forgejo/workflows/build-theme-send-core-repo.yml index 58a337f..d0b206b 100644 --- a/.forgejo/workflows/build-theme-send-core-repo.yml +++ b/.forgejo/workflows/build-theme-send-core-repo.yml @@ -120,6 +120,7 @@ jobs: rm -rf build || true makepkg -s --noconfirm -f cp -v build/raveos-hyprland-theme-*.pkg.tar.zst /tmp/builtpkgs/ + rm -f /tmp/builtpkgs/raveos-hyprland-theme-debug-*.pkg.tar.zst || true - name: Build raveos-cosmic-theme run: | diff --git a/raveos-calamares-theme/PKGBUILD b/raveos-calamares-theme/PKGBUILD index 9d48d3d..5c6d3ce 100644 --- a/raveos-calamares-theme/PKGBUILD +++ b/raveos-calamares-theme/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: AlexC <alexc@alexc.hu> pkgname=raveos-calamares-theme pkgver=2.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="RaveOS Calamares Theme" arch=('any') url="https://git.rp1.hu/RaveOS" diff --git a/raveos-calamares-theme/etc/calamares/modules/netinstall-desktop.yaml b/raveos-calamares-theme/etc/calamares/modules/netinstall-desktop.yaml index db9c34c..3e81174 100644 --- a/raveos-calamares-theme/etc/calamares/modules/netinstall-desktop.yaml +++ b/raveos-calamares-theme/etc/calamares/modules/netinstall-desktop.yaml @@ -27,6 +27,7 @@ - sddm-astronaut-theme - pipewire-jack - hblock + - reflector - raveos-tools - name: "KDE Plasma Desktop - Alap desktop, nincs általunk témázva" selected: false diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-final.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-final.conf index 9a337c4..cd28eaa 100644 --- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-final.conf +++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-final.conf @@ -22,4 +22,5 @@ script: - "if [ -x ${ROOT}/usr/lib/raveos-gnome-theme/auto-apply.sh ]; then arch-chroot ${ROOT} /usr/lib/raveos-gnome-theme/auto-apply.sh; fi" - "if [ -x ${ROOT}/usr/lib/raveos-cosmic-theme/auto-apply.sh ]; then arch-chroot ${ROOT} /usr/lib/raveos-cosmic-theme/auto-apply.sh; fi" - "if [ -x ${ROOT}/usr/lib/raveos-kde-theme/auto-apply.sh ]; then arch-chroot ${ROOT} /usr/lib/raveos-kde-theme/auto-apply.sh; fi" - - "if [ -x ${ROOT}/usr/lib/raveos-hyprland-theme/auto-apply.sh ]; then arch-chroot ${ROOT} /usr/lib/raveos-hyprland-theme/auto-apply.sh; fi"
\ No newline at end of file + - "if [ -x ${ROOT}/usr/lib/raveos-hyprland-theme/auto-apply.sh ]; then arch-chroot ${ROOT} /usr/lib/raveos-hyprland-theme/auto-apply.sh; fi" + - "chroot ${ROOT} systemctl enable reflector-once.service"
\ No newline at end of file diff --git a/raveos-calamares-theme/etc/systemd/system/reflector-once.service b/raveos-calamares-theme/etc/systemd/system/reflector-once.service new file mode 100644 index 0000000..b21c1fa --- /dev/null +++ b/raveos-calamares-theme/etc/systemd/system/reflector-once.service @@ -0,0 +1,14 @@ +[Unit] +Description=Update pacman mirrorlist with reflector +Wants=network-online.target +After=network-online.target +ConditionPathExists=/etc/systemd/system/reflector-once.service +After=multi-user.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/reflector -c HU,AT,DE,PL,CZ --protocol https --sort rate --latest 20 --download-timeout 10 --threads 5 --save /etc/pacman.d/mirrorlist +ExecStartPost=/bin/systemctl disable reflector-once.service + +[Install] +WantedBy=multi-user.target diff --git a/raveos-hyprland-theme/PKGBUILD b/raveos-hyprland-theme/PKGBUILD index e36e244..7cbe3f5 100644 --- a/raveos-hyprland-theme/PKGBUILD +++ b/raveos-hyprland-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=raveos-hyprland-theme pkgver=0.0.0 -pkgrel=9 +pkgrel=10 pkgdesc="RaveOS Hyprland theme payload and installer (includes DankMaterialShell)" arch=('any') url="https://raveos.local" @@ -10,7 +10,6 @@ install="${pkgname}.install" source=() sha256sums=() -# Build redirection BUILDDIR="${startdir}/build" PKGDEST="${startdir}/build" SRCDEST="${startdir}/build" @@ -26,9 +25,6 @@ package() { install -dm755 "${pkgdir}/usr/share/raveos/hyprland-theme" cp -r --no-preserve=ownership "${startdir}/theme-data" "${pkgdir}/usr/share/raveos/hyprland-theme/" - # Install DMS binary - install -Dm755 "${startdir}/theme-data/DankMaterialShell/core/dms" "${pkgdir}/usr/bin/dms" - install -Dm755 "${startdir}/raveos-hyprland-apply.sh" \ "${pkgdir}/usr/lib/raveos-hyprland-theme/auto-apply.sh" install -Dm644 "${startdir}/raveos-hyprland-theme-apply.service" \ |