From 346b8d0ef1ab5782a26dc3c79ef0a29bb3a27e51 Mon Sep 17 00:00:00 2001 From: ahspw Date: Tue, 2 Jan 2024 13:55:49 +0330 Subject: [PATCH] CPACK: resolve ci issue and dbhelper comments Signed-off-by: ahspw --- CMakeLists.txt | 1 + cpack/debian/postinst | 2 -- cpack/debian/postrm | 2 -- cpack/debian/prerm | 3 +-- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39b2d1045be..621f4970726 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1123,6 +1123,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(FLB_INSTALL_BINDIR "bin") set(FLB_INSTALL_LIBDIR "lib") set(FLB_INSTALL_CONFDIR "conf") + set(FLB_INSTALL_INITDIR "init.d") set(FLB_INSTALL_INCLUDEDIR "include") else() set(FLB_INSTALL_BINDIR ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/cpack/debian/postinst b/cpack/debian/postinst index cb983832aff..8335c196384 100755 --- a/cpack/debian/postinst +++ b/cpack/debian/postinst @@ -17,7 +17,6 @@ case "${1}" in ;; esac -# Automatically added by dh_installinit/12.10 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then if [ -x "/etc/init.d/fluent-bit" ]; then update-rc.d fluent-bit defaults >/dev/null @@ -29,7 +28,6 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-decon invoke-rc.d fluent-bit $_dh_action || exit 1 fi fi -# End automatically added section exit 0 diff --git a/cpack/debian/postrm b/cpack/debian/postrm index 89e1fc9bf50..3ac41988b77 100755 --- a/cpack/debian/postrm +++ b/cpack/debian/postrm @@ -17,11 +17,9 @@ case "${1}" in ;; esac -# Automatically added by dh_installinit/12.10 if [ "$1" = "purge" ] ; then update-rc.d fluent-bit remove >/dev/null fi -# End automatically added section exit 0 diff --git a/cpack/debian/prerm b/cpack/debian/prerm index bd4514a6a64..50259eae318 100755 --- a/cpack/debian/prerm +++ b/cpack/debian/prerm @@ -1,7 +1,6 @@ #!/bin/sh set -e -# Automatically added by dh_installinit/12.10 + if [ -x "/etc/init.d/fluent-bit" ] && [ "$1" = remove ]; then invoke-rc.d fluent-bit stop || exit 1 fi -# End automatically added section