Skip to content

usysconf-epoch: Fix non-standard desktop environments not transitioning #9368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
silkeh merged 1 commit into from
Jun 24, 2026
Merged

usysconf-epoch: Fix non-standard desktop environments not transitioning #9368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/u/usysconf-epoch/files/20-usysconf-epoch.preset
View file
Open in desktop

This file was deleted.

22 changes: 13 additions & 9 deletions packages/u/usysconf-epoch/files/epoch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions packages/u/usysconf-epoch/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,6 +13,9 @@
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
15 changes: 8 additions & 7 deletions packages/u/usysconf-epoch/pspec_x86_64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<PISI>
<Source>
<Name>usysconf-epoch</Name>
<Homepage>https://github.com/getsolus/usysconf/</Homepage>
<Packager>
<Name>Evan Maddock</Name>
<Email>maddock.evan@vivaldi.net</Email>
<Name>Silke Hofstra</Name>
<Email>silke@slxh.eu</Email>
</Packager>
<License>GPL-2.0-only</License>
<PartOf>system.base</PartOf>
Expand All @@ -20,20 +20,21 @@
</Description>
<PartOf>system.base</PartOf>
<Files>
<Path fileType="library">/usr/lib64/systemd/system-preset/20-usysconf-epoch.preset</Path>
<Path fileType="library">/usr/lib64/systemd/system/epoch.service</Path>
<Path fileType="library">/usr/lib64/systemd/system/multi-user.target.wants/epoch.service</Path>
<Path fileType="library">/usr/lib64/systemd/system/sysinit.target.wants/usr-merge.service</Path>
<Path fileType="library">/usr/lib64/systemd/system/usr-merge.service</Path>
<Path fileType="library">/usr/lib64/usysconf/epoch.sh</Path>
<Path fileType="library">/usr/lib64/usysconf/usr-merge.sh</Path>
</Files>
</Package>
<History>
<Update release="26">
<Date>2026-03-14</Date>
<Update release="27">
<Date>2026-06-21</Date>
<Version>1.0.0</Version>
<Comment>Packaging update</Comment>
<Name>Evan Maddock</Name>
<Email>maddock.evan@vivaldi.net</Email>
<Name>Silke Hofstra</Name>
<Email>silke@slxh.eu</Email>
</Update>
</History>
</PISI>
Loading