repo: Rename daemon to triambienced

Author: JamiKettunen

config/triambience.service renamed to config/triambienced.service

@@ -1,11 +1,11 @@
 #
-# triambience RPM spec
+# triambienced RPM spec
 #
 # (C) kimmoli 2016
 # (C) Jami Kettunen 2019
 #
 
-Name:       triambience
+Name:       triambienced
 
 %{!?qtc_qmake:%define qtc_qmake %qmake}
 %{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
@@ -17,7 +17,7 @@ Version:    0.0.devel
 Release:    1
 Group:      System/Daemons
 License:    LICENSE
-URL:        https://github.com/sailfishos-oneplus5/triambience
+URL:        https://github.com/sailfishos-oneplus5/triambience-daemon
 Source0:    %{name}-%{version}.tar.bz2
 
 BuildRequires:  pkgconfig(Qt5Core)
@@ -44,20 +44,20 @@ rm -rf %{buildroot}
 %preun
 # in case of complete removal, stop and disable
 if [ "$1" = "0" ]; then
-  systemctl-user stop triambience || true
-  systemctl-user disable triambience || true
+  systemctl-user stop triambienced || true
+  systemctl-user disable triambienced || true
 fi
 
 %post
 systemctl-user daemon-reload || true
-systemctl-user start triambience || true
-systemctl-user enable triambience || true
+systemctl-user start triambienced || true
+systemctl-user enable triambienced || true
 
 %pre
 # In case of update, stop first
 if [ "$1" = "2" ]; then
-  systemctl-user stop triambience || true
-  systemctl-user disable triambience || true
+  systemctl-user stop triambienced || true
+  systemctl-user disable triambienced || true
 fi
 
 %files

rpm/triambience.spec renamed to rpm/triambienced.spec

@@ -13,7 +13,7 @@
 switcher::switcher(QObject *parent) : QObject(parent)
 {
     if (!QDBusConnection::sessionBus().isConnected())
-        printf("triambience: Cannot connect to the D-Bus sessionBus\n%s\n", qPrintable(QDBusConnection::sessionBus().lastError().message()));
+        printf("triambienced: Cannot connect to the D-Bus sessionBus\n%s\n", qPrintable(QDBusConnection::sessionBus().lastError().message()));
 
     currentKeypos = QString();
 
@@ -35,7 +35,7 @@ switcher::switcher(QObject *parent) : QObject(parent)
 
 void switcher::handleAmbienceSettingsChanged()
 {
-    printf("triambience: ambience configuration changed\n");
+    printf("triambienced: ambience configuration changed\n");
 
     ambiences.insert("top", ambience_top->value(QString("silent")).toString());
     ambiences.insert("middle", ambience_middle->value(QString("sailing")).toString());
@@ -46,7 +46,7 @@ void switcher::switchTo(QString keypos)
 {
     if (keypos == currentKeypos) return;
 
-    printf("triambience: Key in %s position, changing to %s\n", qPrintable(keypos), qPrintable(ambiences.value(keypos)));
+    printf("triambienced: Key in %s position, changing to %s\n", qPrintable(keypos), qPrintable(ambiences.value(keypos)));
     currentKeypos = keypos;
 
     filter->start();

src/switcher.cpp

@@ -27,7 +27,7 @@ int main(int argc, char **argv)
     setlinebuf(stdout);
     setlinebuf(stderr);
 
-    printf("triambience: Starting daemon version %s\n", APPVERSION);
+    printf("triambienced: Starting daemon version %s\n", APPVERSION);
 
     switcher *sw;
     UinputEvPoll *uin;
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
     int fd = uin->openDevice("/dev/input/event3");
     if (fd == -1)
     {
-        printf("triambience: error opening input device\n");
+        printf("triambienced: error opening input device\n");
         return EXIT_FAILURE;
     }
 

src/triambience.cpp renamed to src/triambience-daemon.cpp

@@ -53,7 +53,7 @@ void UinputEvPoll::doPoll()
 
     if (epfd < 0)
     {
-        printf("triambience: Failed to create epoll instance\n");
+        printf("triambienced: Failed to create epoll instance\n");
 
         emit finished();
         return;
@@ -66,14 +66,14 @@ void UinputEvPoll::doPoll()
     ret = epoll_ctl(epfd, EPOLL_CTL_ADD, _uinputfd, &ev);
     if (ret)
     {
-        printf("triambience: Couldn't add to epoll\n");
+        printf("triambienced: Couldn't add to epoll\n");
         close(epfd);
 
         emit finished();
         return;
     }
 
-    printf("triambience: Starting tristate key polling.\n");
+    printf("triambienced: Starting tristate key polling.\n");
 
     for (;;)
     {
@@ -126,7 +126,7 @@ void UinputEvPoll::readKeyboard(int fd)
 
     if (len < 0 && errno != EWOULDBLOCK)
     {
-        printf("triambience: Couldn't read, %s\n", strerror(errno));
+        printf("triambienced: Couldn't read, %s\n", strerror(errno));
         return;
     }
 }

src/uinputevpoll.cpp

@@ -1,4 +1,4 @@
-TARGET = triambience
+TARGET = triambienced
 
 CONFIG += link_pkgconfig
 PKGCONFIG += mlite5
@@ -13,7 +13,7 @@ HEADERS += \
     src/uinputevpoll.h
 
 SOURCES += \
-    src/triambience.cpp \
+    src/triambience-daemon.cpp \
     src/switcher.cpp \
     src/uinputevpoll.cpp