From: Jean-Marc Pigeon (Delson) <jmp@safe.ca>
Date: Thu, 17 Jul 2025 22:02:36 +0000 (-0400)
Subject: Adjusting libexec structure
X-Git-Tag: tag-0.14~68
X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=27984f3d80491c90baa4583321e26d17b52f06ed;p=jmp%2Fmailleur

Adjusting libexec structure
---

diff --git a/linux/osukiss/receiver b/linux/osukiss/receiver
index fcd4b28..b908605 100644
--- a/linux/osukiss/receiver
+++ b/linux/osukiss/receiver
@@ -48,13 +48,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/libexec/$APPNAME/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APPNAME/bin/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/bin/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;
diff --git a/linux/osukiss/scanner b/linux/osukiss/scanner
index c9bb3d8..d24d907 100644
--- a/linux/osukiss/scanner
+++ b/linux/osukiss/scanner
@@ -48,13 +48,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/libexec/$APPNAME/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APPNAME/bin/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/bin/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;
diff --git a/linux/osukiss/sender b/linux/osukiss/sender
index 8bab796..28b6401 100644
--- a/linux/osukiss/sender
+++ b/linux/osukiss/sender
@@ -47,13 +47,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/libexec/$APPNAME/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APPNAME/bin/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/bin/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;
diff --git a/linux/osukiss/sorter b/linux/osukiss/sorter
index 1936e6c..30ceca9 100644
--- a/linux/osukiss/sorter
+++ b/linux/osukiss/sorter
@@ -48,13 +48,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/libexec/$APPNAME/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APPNAME/bin/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/bin/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;
diff --git a/mailleur.spec.in b/mailleur.spec.in
index 37a36c6..c1046a1 100644
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -196,8 +196,12 @@ case "$OS" in
     ;;
   esac
 
+#adjusting libexec bin directory
+%{__ln_s}  ./bin-posql %{_libexecdir}/%{name}/bin
+
 %postun			postgresql
 if [ "$1" = 0 ]; then
+  rm -f %{_libexecdir}/%{name}/bin
   rm -f %{_sbindir}/receiver
   rm -f %{_sbindir}/scanner
   rm -f %{_sbindir}/sender
@@ -261,8 +265,12 @@ case "$OS" in
     ;;
   esac
 
+#adjusting libexec bin directory
+%{__ln_s}  ./bin-mysql %{_libexecdir}/%{name}/bin
+
 %postun			mysql
 if [ "$1" = 0 ]; then
+  rm -f %{_libexecdir}/%{name}/bin
   rm -f %{_sbindir}/receiver
   rm -f %{_sbindir}/scanner
   rm -f %{_sbindir}/sender