Provide RPM support (#140)

[#85] Provide RPM support Fixed commands execution errors handling. Signed-off-by: Konstantina Gramatova <[email protected]>
eclipse-kanto · Sep 21, 2022 · 692549f · 692549f
1 parent 160ec37
commit 692549f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/build/postinst_rpm b/build/postinst_rpm
@@ -6,7 +6,7 @@ if [ $1 -eq 1 ] && [ -x "/usr/lib/systemd/systemd-update-helper" ]; then
     /usr/lib/systemd/systemd-update-helper install-system-units containerd.service || :
 
     # Configure Mosquitto to look for the suite-connector config file
-    echo "include_dir /etc/mosquitto/conf.d" >> /etc/mosquitto/mosquitto.conf
+    echo "include_dir /etc/mosquitto/conf.d" >> /etc/mosquitto/mosquitto.conf || :
     /usr/lib/systemd/systemd-update-helper mark-restart-system-units mosquitto.service || :
 
     # Install the Kanto services

diff --git a/build/postrm_rpm b/build/postrm_rpm
@@ -2,15 +2,14 @@ if [ $1 -ge 1 ] && [ -x "/usr/lib/systemd/systemd-update-helper" ]; then
     # Package upgrade, not uninstall
 
     # Mark the Kanto services for restart, including ones that are usually disabled by default
-    # Shouldn't we mark the services in the pre and call daemon reload-restart in the post - it's not handled by default
-    /usr/lib/systemd/systemd-update-helper mark-restart-system-units suite-connector.service
-    /usr/lib/systemd/systemd-update-helper mark-restart-system-units local-digital-twins.service|| :
-    /usr/lib/systemd/systemd-update-helper mark-restart-system-units suite-bootstrapping.service|| :
-    /usr/lib/systemd/systemd-update-helper mark-restart-system-units container-management.service|| :
-    /usr/lib/systemd/systemd-update-helper mark-restart-system-units file-upload.service|| :
-    /usr/lib/systemd/systemd-update-helper mark-restart-system-units software-update.service|| :
-    /usr/lib/systemd/systemd-update-helper mark-restart-system-units file-backup.service|| :
-    /usr/lib/systemd/systemd-update-helper mark-restart-system-units system-metrics.service|| :
+    /usr/lib/systemd/systemd-update-helper mark-restart-system-units suite-connector.service || :
+    /usr/lib/systemd/systemd-update-helper mark-restart-system-units local-digital-twins.service || :
+    /usr/lib/systemd/systemd-update-helper mark-restart-system-units suite-bootstrapping.service || :
+    /usr/lib/systemd/systemd-update-helper mark-restart-system-units container-management.service || :
+    /usr/lib/systemd/systemd-update-helper mark-restart-system-units file-upload.service || :
+    /usr/lib/systemd/systemd-update-helper mark-restart-system-units software-update.service || :
+    /usr/lib/systemd/systemd-update-helper mark-restart-system-units file-backup.service || :
+    /usr/lib/systemd/systemd-update-helper mark-restart-system-units system-metrics.service || :
 fi
 
 if [ $1 -eq 0 ] && [ -x "/usr/lib/systemd/systemd-update-helper" ]; then

diff --git a/build/prerm_rpm b/build/prerm_rpm
@@ -12,5 +12,5 @@ if [ $1 -eq 0 ] && [ -x "/usr/lib/systemd/systemd-update-helper" ]; then
     /usr/lib/systemd/systemd-update-helper remove-system-units suite-connector.service || :
 
     # Reload systemd
-    /usr/lib/systemd/systemd-update-helper system-reload
+    /usr/lib/systemd/systemd-update-helper system-reload || :
 fi