Skip to content

Commit c3c2585

Browse files
committed
fix rm2fb on rm2
1 parent 0a9a687 commit c3c2585

1 file changed

Lines changed: 47 additions & 39 deletions

File tree

package/rm2fb/package

Lines changed: 47 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -52,46 +52,52 @@ rm2fb-server() {
5252
replaces=(rm2fb)
5353

5454
package() {
55-
if [[ $arch = rm2 ]]; then
56-
libname="librm2fb_server.so.$_libver"
57-
install -D -m 644 -t "$pkgdir"/opt/lib "$srcdir"/src/server/"$libname"
58-
ln -s "$libname" "$pkgdir"/opt/lib/"${libname%.*.*}"
59-
ln -s "$libname" "$pkgdir"/opt/lib/"${libname%.*}"
60-
install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/rm2fb.service
61-
fi
55+
case "$arch" in
56+
rm2os2 | rm2os3)
57+
libname="librm2fb_server.so.$_libver"
58+
install -D -m 644 -t "$pkgdir"/opt/lib "$srcdir"/src/server/"$libname"
59+
ln -s "$libname" "$pkgdir"/opt/lib/"${libname%.*.*}"
60+
ln -s "$libname" "$pkgdir"/opt/lib/"${libname%.*}"
61+
install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/rm2fb.service
62+
;;
63+
esac
6264
}
6365

6466
configure() {
65-
if [[ $arch = rm2 ]]; then
66-
systemctl daemon-reload
67-
if systemctl enable rm2fb --now; then
68-
# Restart xochitl if it's running
69-
if is-active xochitl; then
70-
# Reset the crash count so we don't trigger remarkable-fail
71-
echo "0" > /tmp/crashnum
72-
systemctl restart xochitl
67+
case "$arch" in
68+
rm2os2 | rm2os3)
69+
systemctl daemon-reload
70+
if systemctl enable rm2fb --now; then
71+
# Restart xochitl if it's running
72+
if is-active xochitl; then
73+
# Reset the crash count so we don't trigger remarkable-fail
74+
echo "0" > /tmp/crashnum
75+
systemctl restart xochitl
76+
fi
77+
else
78+
disable-unit rm2fb.service
79+
echo "Failed to start rm2fb. Keeping it disabled for now."
80+
echo "Please check the logs and open an issue:"
81+
echo " https://github.com/toltec-dev/toltec/issues/new"
82+
exit 1
7383
fi
74-
else
75-
disable-unit rm2fb.service
76-
echo "Failed to start rm2fb. Keeping it disabled for now."
77-
echo "Please check the logs and open an issue:"
78-
echo " https://github.com/toltec-dev/toltec/issues/new"
79-
exit 1
80-
fi
81-
fi
84+
;;
85+
esac
8286
}
8387

8488
preremove() {
85-
if [[ $arch = rm2 ]]; then
86-
disable-unit rm2fb.service
87-
echo -n "make sure "
88-
if ! is-enabled xochitl.service; then
89-
echo "to re-enable xochitl with 'systemctl enable xochitl --now'"
90-
echo -n "and "
91-
fi
92-
echo "to disable / uninstall any launchers like draft, oxide or remux before"
93-
echo "rebooting your tablet to complete the uninstallation"
94-
fi
89+
case "$arch" in
90+
rm2os2 | rm2os3)
91+
disable-unit rm2fb.service
92+
echo -n "make sure "
93+
if ! is-enabled xochitl.service; then
94+
echo "to re-enable xochitl with 'systemctl enable xochitl --now'"
95+
echo -n "and "
96+
fi
97+
echo "to disable / uninstall any launchers like draft, oxide or remux before"
98+
echo "rebooting your tablet to complete the uninstallation"
99+
;;
100+
esac
95101
}
96102
}
97103

@@ -116,11 +122,13 @@ rm2fb-client() {
116122

117123
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/rm2fb-client
118124

119-
if [[ $arch = rm2 ]]; then
120-
install -D -m 644 -t "$pkgdir"/opt/etc/xochitl.env.d "$srcdir"/rm2fb-preload.env
121-
install -D -m 644 -t "$pkgdir"/etc/systemd/system/draft.service.d "$srcdir"/rm2fb-preload.conf
122-
install -D -m 644 -t "$pkgdir"/etc/systemd/system/remux.service.d "$srcdir"/rm2fb-preload.conf
123-
install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d "$srcdir"/rm2fb-preload.conf
124-
fi
125+
case "$arch" in
126+
rm2os2 | rm2os3)
127+
install -D -m 644 -t "$pkgdir"/opt/etc/xochitl.env.d "$srcdir"/rm2fb-preload.env
128+
install -D -m 644 -t "$pkgdir"/etc/systemd/system/draft.service.d "$srcdir"/rm2fb-preload.conf
129+
install -D -m 644 -t "$pkgdir"/etc/systemd/system/remux.service.d "$srcdir"/rm2fb-preload.conf
130+
install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d "$srcdir"/rm2fb-preload.conf
131+
;;
132+
esac
125133
}
126134
}

0 commit comments

Comments
 (0)