Skip to content

Commit 72fdebf

Browse files
committed
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.
1 parent 4952ce7 commit 72fdebf

4 files changed

Lines changed: 28 additions & 22 deletions

File tree

packages/u/usysconf-epoch/files/20-usysconf-epoch.preset

Lines changed: 0 additions & 2 deletions
This file was deleted.

packages/u/usysconf-epoch/files/epoch.sh

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ declare -A DESKTOP_SOFTWARE_CENTRE=(
2727
["kde"]="discover"
2828
["xfce"]="discover"
2929
["mate"]="discover"
30+
["other"]=""
3031
)
3132
declare -A SC_DESKTOP_FILES=(
3233
["discover"]="/usr/share/applications/org.kde.discover.desktop"
3334
["gnome-software"]="/usr/share/applications/org.gnome.Software.desktop"
3435
)
3536

36-
desktop=""
37+
desktop="other"
3738
replaced_sc=false
3839
switched_repo=false
3940

@@ -228,15 +229,18 @@ done
228229
sc_package="${DESKTOP_SOFTWARE_CENTRE[$desktop]}"
229230
echo "Detected desktop: ${desktop}"
230231

231-
if ! is_installed "${sc_package}"
232+
if [[ "${sc_package}" != "" ]]
232233
then
233-
echo "Installing new SC: ${sc_package}"
234-
while ! eopkg install --yes-all "${DESKTOP_SOFTWARE_CENTRE[$desktop]}"
235-
do
236-
echo "Install failed, will retry."
237-
sleep 10
238-
done
239-
replaced_sc=true
234+
if ! is_installed "${sc_package}"
235+
then
236+
echo "Installing new SC: ${sc_package}"
237+
while ! eopkg install --yes-all "${DESKTOP_SOFTWARE_CENTRE[$desktop]}"
238+
do
239+
echo "Install failed, will retry."
240+
sleep 10
241+
done
242+
replaced_sc=true
243+
fi
240244
fi
241245

242246
if is_installed solus-sc
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json
22
name : usysconf-epoch
33
version : 1.0.0
4-
release : 26
4+
release : 27
55
source :
66
# We need something for a source
77
- https://getsol.us/sources/hotspot.txt : a12b7cb43c9d9134b5bb1b35e9096b66775d9e92e7611d1cc92b02edd6782a87
@@ -13,6 +13,9 @@ summary : Temporary package for hosting epoch and usr-merge scripts
1313
description: |
1414
Temporary package for hosting the epoch script
1515
install : |
16-
install -Dm00755 -t ${installdir}/%libdir%/usysconf/ ${pkgfiles}/*.sh
17-
install -Dm00644 -t ${installdir}/%libdir%/systemd/system/ ${pkgfiles}/*.service
18-
install -Dm00644 -t ${installdir}/%libdir%/systemd/system-preset/ ${pkgfiles}/20-usysconf-epoch.preset
16+
install -Dm00755 -t $installdir/usr/lib64/usysconf/ $pkgfiles/*.sh
17+
install -Dm00644 -t $installdir/%libdir%/systemd/system/ $pkgfiles/*.service
18+
19+
install -Ddm00755 $installdir/%libdir%/systemd/system/{sysinit,multi-user}.target.wants
20+
ln -srv $installdir/%libdir%/systemd/system/usr-merge.service $installdir/%libdir%/systemd/system/sysinit.target.wants/usr-merge.service
21+
ln -srv $installdir/%libdir%/systemd/system/epoch.service $installdir/%libdir%/systemd/system/multi-user.target.wants/epoch.service

packages/u/usysconf-epoch/pspec_x86_64.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Name>usysconf-epoch</Name>
44
<Homepage>https://github.com/getsolus/usysconf/</Homepage>
55
<Packager>
6-
<Name>Evan Maddock</Name>
7-
<Email>maddock.evan@vivaldi.net</Email>
6+
<Name>Silke Hofstra</Name>
7+
<Email>silke@slxh.eu</Email>
88
</Packager>
99
<License>GPL-2.0-only</License>
1010
<PartOf>system.base</PartOf>
@@ -20,20 +20,21 @@
2020
</Description>
2121
<PartOf>system.base</PartOf>
2222
<Files>
23-
<Path fileType="library">/usr/lib64/systemd/system-preset/20-usysconf-epoch.preset</Path>
2423
<Path fileType="library">/usr/lib64/systemd/system/epoch.service</Path>
24+
<Path fileType="library">/usr/lib64/systemd/system/multi-user.target.wants/epoch.service</Path>
25+
<Path fileType="library">/usr/lib64/systemd/system/sysinit.target.wants/usr-merge.service</Path>
2526
<Path fileType="library">/usr/lib64/systemd/system/usr-merge.service</Path>
2627
<Path fileType="library">/usr/lib64/usysconf/epoch.sh</Path>
2728
<Path fileType="library">/usr/lib64/usysconf/usr-merge.sh</Path>
2829
</Files>
2930
</Package>
3031
<History>
31-
<Update release="26">
32-
<Date>2026-03-14</Date>
32+
<Update release="27">
33+
<Date>2026-06-21</Date>
3334
<Version>1.0.0</Version>
3435
<Comment>Packaging update</Comment>
35-
<Name>Evan Maddock</Name>
36-
<Email>maddock.evan@vivaldi.net</Email>
36+
<Name>Silke Hofstra</Name>
37+
<Email>silke@slxh.eu</Email>
3738
</Update>
3839
</History>
3940
</PISI>

0 commit comments

Comments
 (0)