From 72fdebfdccd1facc6641d59180fd0a437fa17bd1 Mon Sep 17 00:00:00 2001 From: Silke Hofstra Date: Sun, 21 Jun 2026 14:03:12 +0200 Subject: [PATCH] usysconf-epoch: Fix non-standard desktop environments not transitioning **Summary** Fix an issue where non-standard desktops would not transition because there is no defined software center to transition them to. Such desktop environments will now result in having no UI alternative: users doing such tinkering should be able to use `eopkg` to install their desired alternative. Additionally, restore backwards compatibility of this package by reverting the preset files change. --- .../files/20-usysconf-epoch.preset | 2 -- packages/u/usysconf-epoch/files/epoch.sh | 22 +++++++++++-------- packages/u/usysconf-epoch/package.yml | 11 ++++++---- packages/u/usysconf-epoch/pspec_x86_64.xml | 15 +++++++------ 4 files changed, 28 insertions(+), 22 deletions(-) delete mode 100644 packages/u/usysconf-epoch/files/20-usysconf-epoch.preset diff --git a/packages/u/usysconf-epoch/files/20-usysconf-epoch.preset b/packages/u/usysconf-epoch/files/20-usysconf-epoch.preset deleted file mode 100644 index 36e03e2f4745..000000000000 --- a/packages/u/usysconf-epoch/files/20-usysconf-epoch.preset +++ /dev/null @@ -1,2 +0,0 @@ -enable usr-merge.service -enable epoch.service diff --git a/packages/u/usysconf-epoch/files/epoch.sh b/packages/u/usysconf-epoch/files/epoch.sh index 01e60dad61a8..6e7914d0c0f4 100644 --- a/packages/u/usysconf-epoch/files/epoch.sh +++ b/packages/u/usysconf-epoch/files/epoch.sh @@ -27,13 +27,14 @@ declare -A DESKTOP_SOFTWARE_CENTRE=( ["kde"]="discover" ["xfce"]="discover" ["mate"]="discover" + ["other"]="" ) declare -A SC_DESKTOP_FILES=( ["discover"]="/usr/share/applications/org.kde.discover.desktop" ["gnome-software"]="/usr/share/applications/org.gnome.Software.desktop" ) -desktop="" +desktop="other" replaced_sc=false switched_repo=false @@ -228,15 +229,18 @@ done sc_package="${DESKTOP_SOFTWARE_CENTRE[$desktop]}" echo "Detected desktop: ${desktop}" -if ! is_installed "${sc_package}" +if [[ "${sc_package}" != "" ]] then - echo "Installing new SC: ${sc_package}" - while ! eopkg install --yes-all "${DESKTOP_SOFTWARE_CENTRE[$desktop]}" - do - echo "Install failed, will retry." - sleep 10 - done - replaced_sc=true + if ! is_installed "${sc_package}" + then + echo "Installing new SC: ${sc_package}" + while ! eopkg install --yes-all "${DESKTOP_SOFTWARE_CENTRE[$desktop]}" + do + echo "Install failed, will retry." + sleep 10 + done + replaced_sc=true + fi fi if is_installed solus-sc diff --git a/packages/u/usysconf-epoch/package.yml b/packages/u/usysconf-epoch/package.yml index db42eeeec025..0fd068abf065 100644 --- a/packages/u/usysconf-epoch/package.yml +++ b/packages/u/usysconf-epoch/package.yml @@ -1,7 +1,7 @@ # yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json name : usysconf-epoch version : 1.0.0 -release : 26 +release : 27 source : # We need something for a source - https://getsol.us/sources/hotspot.txt : a12b7cb43c9d9134b5bb1b35e9096b66775d9e92e7611d1cc92b02edd6782a87 @@ -13,6 +13,9 @@ summary : Temporary package for hosting epoch and usr-merge scripts description: | Temporary package for hosting the epoch script install : | - install -Dm00755 -t ${installdir}/%libdir%/usysconf/ ${pkgfiles}/*.sh - install -Dm00644 -t ${installdir}/%libdir%/systemd/system/ ${pkgfiles}/*.service - install -Dm00644 -t ${installdir}/%libdir%/systemd/system-preset/ ${pkgfiles}/20-usysconf-epoch.preset + install -Dm00755 -t $installdir/usr/lib64/usysconf/ $pkgfiles/*.sh + install -Dm00644 -t $installdir/%libdir%/systemd/system/ $pkgfiles/*.service + + install -Ddm00755 $installdir/%libdir%/systemd/system/{sysinit,multi-user}.target.wants + ln -srv $installdir/%libdir%/systemd/system/usr-merge.service $installdir/%libdir%/systemd/system/sysinit.target.wants/usr-merge.service + ln -srv $installdir/%libdir%/systemd/system/epoch.service $installdir/%libdir%/systemd/system/multi-user.target.wants/epoch.service diff --git a/packages/u/usysconf-epoch/pspec_x86_64.xml b/packages/u/usysconf-epoch/pspec_x86_64.xml index 6fb7bb149af2..7d88f4d4f767 100644 --- a/packages/u/usysconf-epoch/pspec_x86_64.xml +++ b/packages/u/usysconf-epoch/pspec_x86_64.xml @@ -3,8 +3,8 @@ usysconf-epoch https://github.com/getsolus/usysconf/ - Evan Maddock - maddock.evan@vivaldi.net + Silke Hofstra + silke@slxh.eu GPL-2.0-only system.base @@ -20,20 +20,21 @@ system.base - /usr/lib64/systemd/system-preset/20-usysconf-epoch.preset /usr/lib64/systemd/system/epoch.service + /usr/lib64/systemd/system/multi-user.target.wants/epoch.service + /usr/lib64/systemd/system/sysinit.target.wants/usr-merge.service /usr/lib64/systemd/system/usr-merge.service /usr/lib64/usysconf/epoch.sh /usr/lib64/usysconf/usr-merge.sh - - 2026-03-14 + + 2026-06-21 1.0.0 Packaging update - Evan Maddock - maddock.evan@vivaldi.net + Silke Hofstra + silke@slxh.eu \ No newline at end of file