diff --git a/debian/man/guhd.1 b/debian/man/guhd.1 index c88fed91..1604efaf 100644 --- a/debian/man/guhd.1 +++ b/debian/man/guhd.1 @@ -94,7 +94,7 @@ The logging database: \fI/var/log/guhd.sqlite\fR .br The systemd unit file: \fI/lib/systemd/system/guhd.service\fR .br -The plugins directory: \fI/usr/lib/guh/plugins/\fR +The plugins directory: \fI/usr/lib//guh/plugins/\fR .SH SEE ALSO Full developer documentation at: .br diff --git a/libguh/guhsettings.cpp b/libguh/guhsettings.cpp index 27b53f6b..17e97eed 100644 --- a/libguh/guhsettings.cpp +++ b/libguh/guhsettings.cpp @@ -236,7 +236,7 @@ QString GuhSettings::consoleLogPath() { QString consoleLogPath; #ifdef SNAPPY - consoleLogPath = QString(qgetenv("SNAP_COMMON")) + "/guhd.log"; + consoleLogPath = QString(qgetenv("SNAP_DATA")) + "/guhd.log"; #else QString organisationName = QCoreApplication::instance()->organizationName(); diff --git a/libguh/libguh.pro b/libguh/libguh.pro index a8fea905..1024463d 100644 --- a/libguh/libguh.pro +++ b/libguh/libguh.pro @@ -8,7 +8,7 @@ DEFINES += LIBGUH_LIBRARY QMAKE_LFLAGS += -fPIC -target.path = /usr/lib +target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH') INSTALLS += target # Avahi libs diff --git a/plugins/deviceplugins/gpio/translations/de_DE.ts b/plugins/deviceplugins/gpio/translations/de_DE.ts index 784b832a..58211693 100644 --- a/plugins/deviceplugins/gpio/translations/de_DE.ts +++ b/plugins/deviceplugins/gpio/translations/de_DE.ts @@ -4,20 +4,20 @@ GpioController - + Gpio Controller The name of the plugin Gpio Controller (127ead55-996a-44ac-ba82-fc3c634e018a) - + Raspberry Pi 2 The name of the vendor (f0d00b66-bbd8-4a07-8591-ea48a61b229e) - - + + GPIO Switch The name of the DeviceClass (3885c520-e202-4435-88f6-3c35c362b2e6) ---------- @@ -25,44 +25,44 @@ The name of the DeviceClass (75d54a59-f9b0-4bc4-a86c-6b1fc47e0663) - + GPIO The name of the paramType (9eda783f-6d9f-4d39-986d-d2cbfff5a7dd) of GPIO Switch - + Pin number The name of the paramType (2204d278-7bc7-407f-ac82-ce3ae1d5779c) of GPIO Switch - + Description The name of the paramType (504798eb-1faa-4703-a57a-2778e4bf9a67) of GPIO Switch - + Power changed The name of the autocreated EventType (06843766-358e-44b0-8d52-2b46ef98459a) - + Power The name of the ParamType of StateType (06843766-358e-44b0-8d52-2b46ef98459a) of DeviceClass GPIO Switch - + Set power The name of the autocreated ActionType (06843766-358e-44b0-8d52-2b46ef98459a) - - + + GPIO Button The name of the DeviceClass (6aff228b-0410-4ef9-9593-51e8639aacea) ---------- @@ -70,19 +70,19 @@ The name of the DeviceClass (ffd2aa29-55cc-4824-ba95-c311784f7824) - + Pressed changed The name of the autocreated EventType (57f1b7cc-26c8-434b-ba04-d3077dc886c8) - + Pressed The name of the ParamType of StateType (57f1b7cc-26c8-434b-ba04-d3077dc886c8) of DeviceClass GPIO Button - + Beaglebone Black The name of the vendor (7835d14b-b455-49bd-9f31-72c6e8c3033d) diff --git a/plugins/deviceplugins/gpio/translations/en_US.ts b/plugins/deviceplugins/gpio/translations/en_US.ts index fdcf9312..06497e06 100644 --- a/plugins/deviceplugins/gpio/translations/en_US.ts +++ b/plugins/deviceplugins/gpio/translations/en_US.ts @@ -4,20 +4,20 @@ GpioController - + Gpio Controller The name of the plugin Gpio Controller (127ead55-996a-44ac-ba82-fc3c634e018a) - + Raspberry Pi 2 The name of the vendor (f0d00b66-bbd8-4a07-8591-ea48a61b229e) - - + + GPIO Switch The name of the DeviceClass (3885c520-e202-4435-88f6-3c35c362b2e6) ---------- @@ -25,44 +25,44 @@ The name of the DeviceClass (75d54a59-f9b0-4bc4-a86c-6b1fc47e0663) - + GPIO The name of the paramType (9eda783f-6d9f-4d39-986d-d2cbfff5a7dd) of GPIO Switch - + Pin number The name of the paramType (2204d278-7bc7-407f-ac82-ce3ae1d5779c) of GPIO Switch - + Description The name of the paramType (504798eb-1faa-4703-a57a-2778e4bf9a67) of GPIO Switch - + Power changed The name of the autocreated EventType (06843766-358e-44b0-8d52-2b46ef98459a) - + Power The name of the ParamType of StateType (06843766-358e-44b0-8d52-2b46ef98459a) of DeviceClass GPIO Switch - + Set power The name of the autocreated ActionType (06843766-358e-44b0-8d52-2b46ef98459a) - - + + GPIO Button The name of the DeviceClass (6aff228b-0410-4ef9-9593-51e8639aacea) ---------- @@ -70,19 +70,19 @@ The name of the DeviceClass (ffd2aa29-55cc-4824-ba95-c311784f7824) - + Pressed changed The name of the autocreated EventType (57f1b7cc-26c8-434b-ba04-d3077dc886c8) - + Pressed The name of the ParamType of StateType (57f1b7cc-26c8-434b-ba04-d3077dc886c8) of DeviceClass GPIO Button - + Beaglebone Black The name of the vendor (7835d14b-b455-49bd-9f31-72c6e8c3033d) diff --git a/plugins/deviceplugins/networkdetector/translations/de_DE.ts b/plugins/deviceplugins/networkdetector/translations/de_DE.ts index 6cd3a56b..981e9c78 100644 --- a/plugins/deviceplugins/networkdetector/translations/de_DE.ts +++ b/plugins/deviceplugins/networkdetector/translations/de_DE.ts @@ -4,37 +4,37 @@ NetworkDetector - + Network Detector The name of the plugin Network Detector (8e0f791e-b273-4267-8605-b7c2f55a68ab) Netzwerk Detetor - + guh The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) guh - + Network Device The name of the DeviceClass (bd216356-f1ec-4324-9785-6982d2174e17) Netwerk Gerät - + host name The name of the paramType (44337c69-6101-4366-9913-ca9332da6b5c) of Network Device Host Name - + Device in network changed The name of the autocreated EventType (cb43e1b5-4f61-4538-bfa2-c33055c542cf) Gerät im Netzwerk geändert - + Device in network The name of the ParamType of StateType (cb43e1b5-4f61-4538-bfa2-c33055c542cf) of DeviceClass Network Device Gerät im Netzwerk diff --git a/plugins/deviceplugins/networkdetector/translations/en_US.ts b/plugins/deviceplugins/networkdetector/translations/en_US.ts index 5bf00c73..2d02a2e3 100644 --- a/plugins/deviceplugins/networkdetector/translations/en_US.ts +++ b/plugins/deviceplugins/networkdetector/translations/en_US.ts @@ -4,37 +4,37 @@ NetworkDetector - + Network Detector The name of the plugin Network Detector (8e0f791e-b273-4267-8605-b7c2f55a68ab) - + guh The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - + Network Device The name of the DeviceClass (bd216356-f1ec-4324-9785-6982d2174e17) - + host name The name of the paramType (44337c69-6101-4366-9913-ca9332da6b5c) of Network Device - + Device in network changed The name of the autocreated EventType (cb43e1b5-4f61-4538-bfa2-c33055c542cf) - + Device in network The name of the ParamType of StateType (cb43e1b5-4f61-4538-bfa2-c33055c542cf) of DeviceClass Network Device diff --git a/plugins/plugins.pri b/plugins/plugins.pri index 974d2a58..c11fdb23 100644 --- a/plugins/plugins.pri +++ b/plugins/plugins.pri @@ -33,6 +33,6 @@ translations.path = /usr/share/guh/translations translations.files = $$[QT_SOURCE_TREE]/translations/*.qm # Install plugin -target.path = /usr/lib/guh/plugins/ +target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')/guh/plugins/ INSTALLS += target translations diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 691e8b7c..0eada68f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -2,12 +2,13 @@ name: guhio version: 0.1.0 summary: An open source IoT server description: The guh daemon is a plugin based IoT (Internet of Things) server. The server works like a translator for devices, things and services and allows them to interact. With the powerful rule engine you are able to connect any device available in the system and create individual scenes and behaviors for your environment. -confinement: strict +confinement: devmode grade: devel apps: guhd: command: qt5-launch guhd -n -p + daemon: simple plugs: - network - network-bind @@ -20,8 +21,15 @@ apps: - bluez - shutdown + guh-cli: + command: guh-cli + plugs: + - network + + parts: - guhd: + # Building the whole guh project containig libguh and plugins + guh: plugin: qmake source: ../ options: [ CONFIG+=ccache, CONFIG+=disabletesting, CONFIG+=snappy ] @@ -29,6 +37,8 @@ parts: project-files: [ guh.pro ] build-packages: - python + - ccache + - dpkg-dev - rsync - qtchooser - qt5-qmake @@ -52,4 +62,23 @@ parts: - libqt5sql5-sqlite - logrotate - avahi-daemon - after: [qt5conf] + after: [ guh-cli, guh-webinterface, qt5conf] + + guh-cli: + plugin: python + python-version: python2 + source: https://github.com/guh/guh-cli.git + source-type: git + build-packages: + - python-dev + - python-pip + - python-setuptools + build-packages: + - python-setuptools + + guh-webinterface: + plugin: dump + source: https://jenkins.guh.io/view/guh-webinterface/job/guh-webinterface-all/lastBuild/artifact/guh-webinterface.tar.gz + source-type: tar + organize: + '*': guh-webinterface/