move abrt-action-FOO from /usr/libexec to /usr/bin

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

6 files changed, 20 insertions, 30 deletions

diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index a181da15..c01ea75a 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -726,13 +726,9 @@ int main(int argc, char** argv)
      * (I saw it set only DBUS_STARTER_ADDRESS and DBUS_STARTER_BUS_TYPE).
      * In this case, set something sane:
      */
-    /* Need to add LIBEXEC_DIR to PATH, because otherwise abrt-action-*
-     * are not found by exec()
-     */
     const char *env_path = getenv("PATH");
     if (!env_path || !env_path[0])
-        env_path = "/usr/sbin:/usr/bin:/sbin:/bin";
-    putenv(xasprintf("PATH=%s:%s", LIBEXEC_DIR, env_path));
+        putenv((char*)"PATH=/usr/sbin:/usr/bin:/sbin:/bin");
 
     putenv(xasprintf("ABRT_VERBOSE=%u", g_verbose));
 
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 319352e0..584b4e3e 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -1,12 +1,12 @@
 bin_SCRIPTS = \
     abrt-handle-upload
-libexec_PROGRAMS = \
-    abrt-action-save-package-data
 
 bin_PROGRAMS = \
-    abrt-handle-crashdump
+    abrt-handle-crashdump \
+    abrt-action-save-package-data
 
-sbin_PROGRAMS = abrtd \
+sbin_PROGRAMS = \
+    abrtd \
     abrt-server
 
 abrtd_SOURCES = \
diff --git a/src/daemon/abrt-handle-crashdump.c b/src/daemon/abrt-handle-crashdump.c
index de809c17..737de408 100644
--- a/src/daemon/abrt-handle-crashdump.c
+++ b/src/daemon/abrt-handle-crashdump.c
@@ -87,13 +87,6 @@ int main(int argc, char **argv)
 
     /* -e EVENT: run event */
 
-    /* Need to add LIBEXEC_DIR to PATH, because otherwise abrt-action-*
-     * are not found by exec()
-     */
-    const char *env_path = getenv("PATH");
-    if (!env_path) env_path = "";
-    putenv(xasprintf("PATH=%s%s%s", LIBEXEC_DIR, (!env_path[0] ? "" : ":"), env_path));
-
     struct run_event_state *run_state = new_run_event_state();
     run_state->logging_callback = do_log;
     int r = run_event_on_dir_name(run_state, dump_dir_name ? dump_dir_name : ".", event);
diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf
index a91460fe..bee79647 100644
--- a/src/daemon/abrt_event.conf
+++ b/src/daemon/abrt_event.conf
@@ -52,7 +52,7 @@ EVENT=analyze analyzer=CCpp backtrace=   abrt-action-generate-backtrace
 # Same as "analyze", but executed when user requests "refresh" in GUI
 #EVENT=reanalyze analyzer=CCpp  trim-debuginfo-cache /var/cache/abrt-di 4096m
 EVENT=reanalyze analyzer=CCpp  abrt-action-install-debuginfo.py "--core=$DUMP_DIR/coredump" "--tmpdir=/var/run/abrt/$$-$RANDOM" --cache=/var/cache/abrt-di
-EVENT=reanalyze analyzer=CCpp   abrt-action-generate-backtrace
+EVENT=reanalyze analyzer=CCpp  abrt-action-generate-backtrace
 
 EVENT=report          analyzer=Kerneloops  abrt-action-kerneloops
 EVENT=report_Bugzilla analyzer=CCpp        abrt-action-bugzilla -c /etc/abrt/plugins/Bugzilla.conf
diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am
index fe2644a6..34cd942e 100644
--- a/src/hooks/Makefile.am
+++ b/src/hooks/Makefile.am
@@ -1,4 +1,5 @@
 libexec_PROGRAMS = abrt-hook-ccpp
+
 bin_PROGRAMS = dumpoops
 
 # abrt-hook-ccpp
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index eee328e0..c960e66e 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,8 +1,20 @@
 pluginslibdir = $(PLUGINS_LIB_DIR)
 
-libexec_SCRIPTS = \
+bin_SCRIPTS = \
     abrt-action-install-debuginfo.py
 
+bin_PROGRAMS = \
+    abrt-action-analyze-c \
+    abrt-action-analyze-python \
+    abrt-action-analyze-oops \
+    abrt-action-generate-backtrace \
+    abrt-action-bugzilla \
+    abrt-action-rhtsupport \
+    abrt-action-kerneloops \
+    abrt-action-upload \
+    abrt-action-mailx \
+    abrt-action-print
+
 pluginslib_LTLIBRARIES = \
     libCCpp.la \
     libKerneloopsScanner.la
@@ -78,18 +90,6 @@ libKerneloopsScanner_la_LDFLAGS = \
     -avoid-version \
     $(GLIB_LIBS)
 
-libexec_PROGRAMS = \
-    abrt-action-analyze-c \
-    abrt-action-analyze-python \
-    abrt-action-analyze-oops \
-    abrt-action-generate-backtrace \
-    abrt-action-bugzilla \
-    abrt-action-rhtsupport \
-    abrt-action-kerneloops \
-    abrt-action-upload \
-    abrt-action-mailx \
-    abrt-action-print
-
 abrt_action_analyze_c_SOURCES = \
     abrt-action-analyze-c.c
 abrt_action_analyze_c_CPPFLAGS = \