Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions .SRCINFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = coolerdash
pkgdesc = Monitor telemetry data on an AIO liquid cooler with an integrated LCD display
pkgver = 2.2.6
pkgdesc = Plug-in for CoolerControl that extends the LCD functionality with additional features
pkgver = 3.0.1
pkgrel = 1
url = https://github.com/damachine/coolerdash
install = coolerdash.install
Expand All @@ -11,7 +11,6 @@ pkgbase = coolerdash
makedepends = pkg-config
makedepends = git
depends = cairo
depends = coolercontrol
depends = jansson
depends = libcurl-gnutls
depends = ttf-roboto
Expand Down
48 changes: 0 additions & 48 deletions .github/workflows/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,30 +156,6 @@ jobs:
echo "⚠️ Manual page not found"
fi

# Check systemd helperd service
if [ -f "/tmp/install-test/usr/lib/systemd/system/coolerdash-helperd.service" ]; then
echo "βœ… Systemd helperd service installed"
else
echo "❌ Systemd helperd service not found"
exit 1
fi

# Check systemd startup-delay drop-in
if [ -f "/tmp/install-test/etc/systemd/system/cc-plugin-coolerdash.service.d/startup-delay.conf" ]; then
echo "βœ… Systemd startup-delay drop-in installed"
else
echo "❌ Systemd startup-delay drop-in not found"
exit 1
fi

# Check udev rules
if [ -f "/tmp/install-test/usr/lib/udev/rules.d/99-coolerdash.rules" ]; then
echo "βœ… Udev rules installed"
else
echo "❌ Udev rules not found"
exit 1
fi

# Check license file (Linux packaging standard)
if [ -f "/tmp/install-test/usr/share/licenses/coolerdash/LICENSE" ]; then
echo "βœ… License file installed (/usr/share/licenses/)"
Expand Down Expand Up @@ -233,30 +209,6 @@ jobs:
exit 1
fi

# Check systemd helperd service
if [ -f "/tmp/install-test/usr/lib/systemd/system/coolerdash-helperd.service" ]; then
echo "βœ… Systemd helperd service installed"
else
echo "❌ Systemd helperd service not found"
exit 1
fi

# Check systemd startup-delay drop-in
if [ -f "/tmp/install-test/etc/systemd/system/cc-plugin-coolerdash.service.d/startup-delay.conf" ]; then
echo "βœ… Systemd startup-delay drop-in installed"
else
echo "❌ Systemd startup-delay drop-in not found"
exit 1
fi

# Check udev rules
if [ -f "/tmp/install-test/usr/lib/udev/rules.d/99-coolerdash.rules" ]; then
echo "βœ… Udev rules installed"
else
echo "❌ Udev rules not found"
exit 1
fi

# Check license file (Arch packaging guideline)
if [ -f "/tmp/install-test/usr/share/licenses/coolerdash/LICENSE" ]; then
echo "βœ… License file installed (/usr/share/licenses/)"
Expand Down
37 changes: 13 additions & 24 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,18 @@ install: check-deps $(TARGET)
$(SUDO) userdel -rf coolerdash; \
LEGACY_FOUND=1; \
fi; \
if [ -d /etc/systemd/system/cc-plugin-coolerdash.service.d ]; then \
$(SUDO) rm -rf /etc/systemd/system/cc-plugin-coolerdash.service.d; \
LEGACY_FOUND=1; \
fi; \
if [ -f /usr/lib/systemd/system/coolerdash-helperd.service ]; then \
$(SUDO) rm -f /usr/lib/systemd/system/coolerdash-helperd.service; \
LEGACY_FOUND=1; \
fi; \
if [ -f /etc/systemd/system/coolerdash-helperd.service ]; then \
$(SUDO) rm -f /etc/systemd/system/coolerdash-helperd.service; \
LEGACY_FOUND=1; \
fi; \
if [ "$$LEGACY_FOUND" -eq 1 ]; then \
printf " $(GREEN)OK$(RESET) Legacy cleanup complete\n"; \
else \
Expand Down Expand Up @@ -284,10 +296,6 @@ install: check-deps $(TARGET)
@install -m644 $(MANIFEST) "$(DESTDIR)/etc/coolercontrol/plugins/coolerdash/manifest.toml"
@sed -i 's/{{VERSION}}/$(VERSION)/g' "$(DESTDIR)/etc/coolercontrol/plugins/coolerdash/manifest.toml"
@sed -i 's/{{VERSION}}/$(VERSION)/g' "$(DESTDIR)/etc/coolercontrol/plugins/coolerdash/ui/index.html"
@install -Dm644 etc/systemd/cc-plugin-coolerdash.service.d/startup-delay.conf "$(DESTDIR)/etc/systemd/system/cc-plugin-coolerdash.service.d/startup-delay.conf"
@install -Dm644 etc/systemd/coolerdash-helperd.service "$(DESTDIR)/usr/lib/systemd/system/coolerdash-helperd.service"
@printf " $(GREEN)Drop-in:$(RESET) $(DESTDIR)/etc/systemd/system/cc-plugin-coolerdash.service.d/startup-delay.conf\n"
@printf " $(GREEN)Service:$(RESET) $(DESTDIR)/usr/lib/systemd/system/coolerdash-helperd.service\n"
@printf " $(GREEN)Binary:$(RESET) $(DESTDIR)/usr/libexec/coolerdash/coolerdash\n"
@printf " $(GREEN)Config JSON:$(RESET) $(DESTDIR)/etc/coolercontrol/plugins/coolerdash/config.json\n"
@printf " $(GREEN)Web UI:$(RESET) $(DESTDIR)/etc/coolercontrol/plugins/coolerdash/ui/index.html\n"
Expand All @@ -310,21 +318,12 @@ install: check-deps $(TARGET)
@printf "$(CYAN)Installing icon...$(RESET)\n"
@install -Dm644 etc/icons/coolerdash.svg "$(DESTDIR)/usr/share/icons/hicolor/scalable/apps/coolerdash.svg"
@printf " $(GREEN)Icon:$(RESET) $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/coolerdash.svg\n"
@printf "$(CYAN)Installing udev rules for USB power management...$(RESET)\n"
@install -Dm644 etc/udev/rules.d/99-coolerdash.rules "$(DESTDIR)/usr/lib/udev/rules.d/99-coolerdash.rules"
@printf " $(GREEN)udev rule:$(RESET) $(DESTDIR)/usr/lib/udev/rules.d/99-coolerdash.rules\n"
@if [ "$(REALOS)" = "yes" ]; then \
$(SUDO) udevadm control --reload-rules 2>/dev/null || true; \
$(SUDO) udevadm trigger --subsystem-match=usb 2>/dev/null || true; \
printf " $(GREEN)OK$(RESET) USB power management configured\n"; \
fi
@printf "\n"
@printf "$(WHITE)INSTALLATION SUCCESSFUL$(RESET)\n"
@printf "\n"
@printf "$(YELLOW)Next steps:$(RESET)\n"
@if [ "$(REALOS)" = "yes" ]; then \
$(SUDO) systemctl daemon-reload 2>/dev/null || true; \
$(SUDO) systemctl enable --now coolerdash-helperd.service 2>/dev/null || true; \
$(SUDO) systemctl restart coolercontrold.service 2>/dev/null || true; \
fi
@printf " $(PURPLE)Reload systemd:$(RESET) systemctl daemon-reload\n"
Expand Down Expand Up @@ -398,23 +397,13 @@ uninstall:
LEGACY_FOUND=1; \
fi; \
fi
@if [ "$(REALOS)" = "yes" ]; then \
$(SUDO) rm -f /etc/systemd/system/coolerdash-helperd.service; \
fi
@$(SUDO) rm -f "$(DESTDIR)/usr/lib/systemd/system/coolerdash-helperd.service"
@$(SUDO) rm -rf "$(DESTDIR)/etc/systemd/system/cc-plugin-coolerdash.service.d"
@$(SUDO) rm -rf "$(DESTDIR)/etc/coolercontrol/plugins/coolerdash"
@$(SUDO) rm -rf "$(DESTDIR)/usr/libexec/coolerdash"
@$(SUDO) rm -rf "$(DESTDIR)/usr/share/licenses/coolerdash"
@$(SUDO) rm -f "$(DESTDIR)/usr/share/man/man1/coolerdash.1"
@$(SUDO) rm -f "$(DESTDIR)/usr/share/applications/coolerdash.desktop"
@printf "$(CYAN)Removing udev rule...$(RESET)\n"
# Legacy cleanup: remove udev rule if installed by older version
@$(SUDO) rm -f "$(DESTDIR)/usr/lib/udev/rules.d/99-coolerdash.rules"
@if [ "$(REALOS)" = "yes" ]; then \
$(SUDO) udevadm control --reload-rules 2>/dev/null || true; \
$(SUDO) udevadm trigger --subsystem-match=usb 2>/dev/null || true; \
printf " $(GREEN)OK$(RESET) udev rules reloaded\n"; \
fi
@$(SUDO) rm -f "$(DESTDIR)/usr/share/icons/hicolor/scalable/apps/coolerdash.svg"
@if [ "$(REALOS)" = "yes" ]; then \
if id -u coolerdash >/dev/null 2>&1; then \
Expand Down
14 changes: 2 additions & 12 deletions PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
# Maintainer: damachin3 (damachine3 at proton dot me)
# Website: https://github.com/damachine/coolerdash

# This PKGBUILD is for building the coolerdash package from local source.
# It assumes the source code is already present in the current directory.

pkgname=coolerdash
pkgver=$(cat VERSION)
pkgrel=1
provides=('coolerdash-git')
replaces=('coolerdash-git')
conflicts=('coolerdash-git')
pkgdesc="Monitor telemetry data on an AIO liquid cooler with an integrated LCD display"
pkgdesc="Plug-in for CoolerControl that extends the LCD functionality with additional features"
arch=('x86_64')
url="https://github.com/damachine/coolerdash"
license=('MIT')
depends=('cairo' 'coolercontrol' 'jansson' 'libcurl-gnutls' 'ttf-roboto')
depends=('cairo' 'jansson' 'libcurl-gnutls' 'ttf-roboto')
makedepends=('gcc' 'make' 'pkg-config' 'git')
optdepends=()
backup=('etc/coolercontrol/plugins/coolerdash/config.json')
Expand Down Expand Up @@ -55,10 +53,6 @@ build() {
cp -a etc/coolercontrol/plugins/coolerdash/manifest.toml "${srcdir}/etc/coolercontrol/plugins/coolerdash/"
cp -a etc/applications/coolerdash.desktop "${srcdir}/etc/applications/"
cp -a etc/icons/coolerdash.svg "${srcdir}/etc/icons/"
cp -a etc/udev/rules.d/99-coolerdash.rules "${srcdir}/etc/udev/rules.d/"
mkdir -p "${srcdir}/etc/systemd/cc-plugin-coolerdash.service.d"
cp -a etc/systemd/coolerdash-helperd.service "${srcdir}/etc/systemd/"
cp -a etc/systemd/cc-plugin-coolerdash.service.d/startup-delay.conf "${srcdir}/etc/systemd/cc-plugin-coolerdash.service.d/"
}

check() {
Expand Down Expand Up @@ -94,10 +88,6 @@ package() {

install -Dm644 "${srcdir}/man/coolerdash.1" "${pkgdir}/usr/share/man/man1/coolerdash.1"
install -Dm644 "${srcdir}/etc/applications/coolerdash.desktop" "${pkgdir}/usr/share/applications/coolerdash.desktop"
install -Dm644 "${srcdir}/etc/udev/rules.d/99-coolerdash.rules" "${pkgdir}/usr/lib/udev/rules.d/99-coolerdash.rules"
install -Dm644 "${srcdir}/etc/icons/coolerdash.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/coolerdash.svg"
install -Dm644 "${srcdir}/etc/systemd/coolerdash-helperd.service" "${pkgdir}/usr/lib/systemd/system/coolerdash-helperd.service"
install -Dm644 "${srcdir}/etc/systemd/cc-plugin-coolerdash.service.d/startup-delay.conf" "${pkgdir}/etc/systemd/system/cc-plugin-coolerdash.service.d/startup-delay.conf"

install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.6
3.0.1
7 changes: 1 addition & 6 deletions aur/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# Maintainer: damachin3 (damachine3 at proton dot me)
# Website: https://github.com/damachine/coolerdash

pkgname=coolerdash-git
pkgver=
pkgrel=1
provides=('coolerdash')
replaces=('coolerdash')
conflicts=('coolerdash')
pkgdesc="Monitor telemetry data on an AIO liquid cooler with an integrated LCD display"
pkgdesc="Plug-in for CoolerControl that extends the LCD functionality with additional features"
arch=('x86_64')
url="https://github.com/damachine/coolerdash"
license=('MIT')
Expand Down Expand Up @@ -75,10 +74,6 @@ package() {

install -Dm644 "${srcdir}/${pkgname}/man/coolerdash.1" "${pkgdir}/usr/share/man/man1/coolerdash.1"
install -Dm644 "${srcdir}/${pkgname}/etc/applications/coolerdash.desktop" "${pkgdir}/usr/share/applications/coolerdash.desktop"
install -Dm644 "${srcdir}/${pkgname}/etc/udev/rules.d/99-coolerdash.rules" "${pkgdir}/usr/lib/udev/rules.d/99-coolerdash.rules"
install -Dm644 "${srcdir}/${pkgname}/etc/icons/coolerdash.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/coolerdash.svg"
install -Dm644 "${srcdir}/${pkgname}/etc/systemd/coolerdash-helperd.service" "${pkgdir}/usr/lib/systemd/system/coolerdash-helperd.service"
install -Dm644 "${srcdir}/${pkgname}/etc/systemd/cc-plugin-coolerdash.service.d/startup-delay.conf" "${pkgdir}/etc/systemd/system/cc-plugin-coolerdash.service.d/startup-delay.conf"

install -Dm644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
37 changes: 16 additions & 21 deletions aur/coolerdash.install
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,23 @@ pre_install() {
}

post_install() {
# Reload udev rules
if command -v udevadm >/dev/null 2>&1; then
udevadm control --reload-rules
udevadm trigger --subsystem-match=usb
fi

# Migrate helperd from /etc to /usr/lib
# Remove legacy files
rm -f /etc/systemd/system/multi-user.target.wants/coolerdash-helperd.service
rm -f /etc/systemd/system/coolerdash-helperd.service
rm -f /usr/lib/systemd/system/coolerdash-helperd.service
rm -rf /etc/systemd/system/cc-plugin-coolerdash.service.d
rm -f /usr/lib/udev/rules.d/99-coolerdash.rules

systemctl daemon-reload

# Enable helperd
if systemctl list-unit-files coolerdash-helperd.service | grep -q coolerdash-helperd; then
systemctl enable --now coolerdash-helperd.service || echo "Note: coolerdash-helperd.service failed. Enable manually."
fi

# Restart CoolerControl
if systemctl list-unit-files coolercontrold.service | grep -q coolercontrold; then
systemctl restart coolercontrold.service || echo "Note: CoolerControl restart failed."
# Restart plugin service directly if it already exists (reinstall case)
if systemctl list-unit-files cc-plugin-coolerdash.service | grep -q cc-plugin-coolerdash; then
systemctl restart cc-plugin-coolerdash.service || echo "Note: Plugin restart failed."
else
# Fresh install: restart CoolerControl so it discovers and starts the plugin service
if systemctl list-unit-files coolercontrold.service | grep -q coolercontrold; then
systemctl restart coolercontrold.service || echo "Note: CoolerControl restart failed."
fi
fi

echo "================================================================"
Expand All @@ -62,17 +59,15 @@ post_install() {
}

post_upgrade() {
# Migrate helperd from /etc to /usr/lib
# Remove legacy files
rm -f /etc/systemd/system/multi-user.target.wants/coolerdash-helperd.service
rm -f /etc/systemd/system/coolerdash-helperd.service
rm -f /usr/lib/systemd/system/coolerdash-helperd.service
rm -rf /etc/systemd/system/cc-plugin-coolerdash.service.d
rm -f /usr/lib/udev/rules.d/99-coolerdash.rules

systemctl daemon-reload

# Enable helperd
if systemctl list-unit-files coolerdash-helperd.service | grep -q coolerdash-helperd; then
systemctl enable --now coolerdash-helperd.service || echo "Note: coolerdash-helperd.service failed. Enable manually."
fi

# Restart plugin
if systemctl list-unit-files cc-plugin-coolerdash.service | grep -q cc-plugin-coolerdash; then
systemctl restart cc-plugin-coolerdash.service || echo "Note: Plugin restart failed."
Expand Down
37 changes: 16 additions & 21 deletions coolerdash.install
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,23 @@ pre_install() {
}

post_install() {
# Reload udev rules
if command -v udevadm >/dev/null 2>&1; then
udevadm control --reload-rules
udevadm trigger --subsystem-match=usb
fi

# Migrate helperd from /etc to /usr/lib
# Remove legacy files
rm -f /etc/systemd/system/multi-user.target.wants/coolerdash-helperd.service
rm -f /etc/systemd/system/coolerdash-helperd.service
rm -f /usr/lib/systemd/system/coolerdash-helperd.service
rm -rf /etc/systemd/system/cc-plugin-coolerdash.service.d
rm -f /usr/lib/udev/rules.d/99-coolerdash.rules

systemctl daemon-reload

# Enable helperd
if systemctl list-unit-files coolerdash-helperd.service | grep -q coolerdash-helperd; then
systemctl enable --now coolerdash-helperd.service || echo "Note: coolerdash-helperd.service failed. Enable manually."
fi

# Restart CoolerControl
if systemctl list-unit-files coolercontrold.service | grep -q coolercontrold; then
systemctl restart coolercontrold.service || echo "Note: CoolerControl restart failed."
# Restart plugin service directly if it already exists (reinstall case)
if systemctl list-unit-files cc-plugin-coolerdash.service | grep -q cc-plugin-coolerdash; then
systemctl restart cc-plugin-coolerdash.service || echo "Note: Plugin restart failed."
else
# Fresh install: restart CoolerControl so it discovers and starts the plugin service
if systemctl list-unit-files coolercontrold.service | grep -q coolercontrold; then
systemctl restart coolercontrold.service || echo "Note: CoolerControl restart failed."
fi
fi

echo "================================================================"
Expand All @@ -62,17 +59,15 @@ post_install() {
}

post_upgrade() {
# Migrate helperd from /etc to /usr/lib
# Remove legacy files
rm -f /etc/systemd/system/multi-user.target.wants/coolerdash-helperd.service
rm -f /etc/systemd/system/coolerdash-helperd.service
rm -f /usr/lib/systemd/system/coolerdash-helperd.service
rm -rf /etc/systemd/system/cc-plugin-coolerdash.service.d
rm -f /usr/lib/udev/rules.d/99-coolerdash.rules

systemctl daemon-reload

# Enable helperd
if systemctl list-unit-files coolerdash-helperd.service | grep -q coolerdash-helperd; then
systemctl enable --now coolerdash-helperd.service || echo "Note: coolerdash-helperd.service failed. Enable manually."
fi

# Restart plugin
if systemctl list-unit-files cc-plugin-coolerdash.service | grep -q cc-plugin-coolerdash; then
systemctl restart cc-plugin-coolerdash.service || echo "Note: Plugin restart failed."
Expand Down
Loading