Merge ~mardy/dekko:push-helper-fix into dekko:master

[Alberto Mardegan]

Use a simple shell script as push helper

The C++ push helper is wrong and unnecessary at this point.

Use a simple shell script as push helper

The C++ push helper is wrong and unnecessary at this point. Still, I'm not removing it here, in case we want to fix and extend it later.

[Dan Chapman  (dpniel)]

Hey,

Thanks for this :-)

So the master branch atm isn't currently the development focus as it contains the old app that uses the trojita backend. The current development focus is on the dekko2 branch which uses the new qmf backend (i should add this to the README), but it's not fully functional yet in regards to online accounts so this helper can't be fully tested just yet.

I'm currently working on getting online accounts integrated for the oauth and sasl plugins into the backend, which is ongoing here http://code.dekkoproject.org/dekko-dev/messagingframework/merge_requests/3.

Although i don't think there will be another release based on the current master branch, would you like me to still merge it anyway?

Cheers

Dan

[Dan Chapman  (dpniel)]

Oh i forgot to mention, i added your helper to dekko2 already https://git.launchpad.net/dekko/commit/?h=dekko2&id=9c3fe95e27d788e61381671ce91556597dbd4195

[Alberto Mardegan (mardy)]

We are attempting to land this silo here:
https://requests.ci-train.ubuntu.com/#/ticket/1722

What is blocking is this change, and bug 1570774. If it were possible to make a release with these two fixes, that would help immensely :-)

[Dan Chapman  (dpniel)]

Right ok. so it would make sense then to get an interim release out to get that silo unblocked, as dekko2 is still a little way off being released.

I will get this mp merged and work out a fix for bug 1570774 in master.

review: Approve

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ec76f1..faa2998 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1087,7 +1087,7 @@ install(
 
 if(CLICK_MODE)
     install(
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/push-helper
+        PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/click/dekko-helper
         DESTINATION ${DATA_DIR}
     )
     install(TARGETS dekko DESTINATION ${BIN_DIR})
diff --git a/click/dekko-helper b/click/dekko-helper
new file mode 100755
index 0000000..84330f1
--- /dev/null
+++ b/click/dekko-helper
@@ -0,0 +1,4 @@
+#!/usr/lib/initramfs-tools/bin/busybox static-sh
+cp $1 $2
+
+# This is just a temporary hack!
\ No newline at end of file
diff --git a/click/pushHelper.json b/click/pushHelper.json
index 3b3da17..8c60ca9 100644
--- a/click/pushHelper.json
+++ b/click/pushHelper.json
@@ -1,3 +1,3 @@
 {
-    "exec": "push-helper"
+    "exec": "dekko-helper"
 }