Skip to content

Commit 0732c52

Browse files
author
ahspw
committed
CPACK: resolve ci issue and dbhelper comments
Signed-off-by: ahspw <[email protected]>
1 parent 3a049ec commit 0732c52

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

Diff for: CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1123,6 +1123,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
11231123
set(FLB_INSTALL_BINDIR "bin")
11241124
set(FLB_INSTALL_LIBDIR "lib")
11251125
set(FLB_INSTALL_CONFDIR "conf")
1126+
set(FLB_INSTALL_INITDIR "init.d")
11261127
set(FLB_INSTALL_INCLUDEDIR "include")
11271128
else()
11281129
set(FLB_INSTALL_BINDIR ${CMAKE_INSTALL_FULL_BINDIR})

Diff for: cpack/debian/postinst

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ case "${1}" in
1717
;;
1818
esac
1919

20-
# Automatically added by dh_installinit/12.10
2120
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
2221
if [ -x "/etc/init.d/fluent-bit" ]; then
2322
update-rc.d fluent-bit defaults >/dev/null
@@ -29,7 +28,6 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-decon
2928
invoke-rc.d fluent-bit $_dh_action || exit 1
3029
fi
3130
fi
32-
# End automatically added section
3331

3432

3533
exit 0

Diff for: cpack/debian/postrm

-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ case "${1}" in
1717
;;
1818
esac
1919

20-
# Automatically added by dh_installinit/12.10
2120
if [ "$1" = "purge" ] ; then
2221
update-rc.d fluent-bit remove >/dev/null
2322
fi
24-
# End automatically added section
2523

2624

2725
exit 0

Diff for: cpack/debian/prerm

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/sh
22
set -e
3-
# Automatically added by dh_installinit/12.10
3+
44
if [ -x "/etc/init.d/fluent-bit" ] && [ "$1" = remove ]; then
55
invoke-rc.d fluent-bit stop || exit 1
66
fi
7-
# End automatically added section

0 commit comments

Comments
 (0)