|
Nikola Pajkovsky |
8750f03 |
From 5ebb242262de0a9d19434f1ab5d881ee2b95627b Mon Sep 17 00:00:00 2001
|
|
Nikola Pajkovsky |
8750f03 |
From: Nikola Pajkovsky <npajkovs@redhat.com>
|
|
Nikola Pajkovsky |
8750f03 |
Date: Mon, 27 Jun 2011 16:42:19 +0200
|
|
Nikola Pajkovsky |
8750f03 |
Subject: [PATCH] Revert "remove bashism from ccpp-hook"
|
|
Nikola Pajkovsky |
8750f03 |
|
|
Nikola Pajkovsky |
8750f03 |
This reverts commit 859c130bf6e1ad927b32068162b07b510599990e.
|
|
Nikola Pajkovsky |
8750f03 |
(cherry picked from commit 71139fc041bb89891c45b4a96872489306c99946)
|
|
Nikola Pajkovsky |
8750f03 |
|
|
Nikola Pajkovsky |
8750f03 |
diff --git a/src/hooks/abrt-install-ccpp-hook.in b/src/hooks/abrt-install-ccpp-hook.in
|
|
Nikola Pajkovsky |
8750f03 |
index b5fac3d..9c7df75 100755
|
|
Nikola Pajkovsky |
8750f03 |
--- a/src/hooks/abrt-install-ccpp-hook.in
|
|
Nikola Pajkovsky |
8750f03 |
+++ b/src/hooks/abrt-install-ccpp-hook.in
|
|
Nikola Pajkovsky |
8750f03 |
@@ -8,17 +8,12 @@ verbose=false
|
|
Nikola Pajkovsky |
8750f03 |
|
|
Nikola Pajkovsky |
8750f03 |
DEFAULT_LOCATION=/var/spool/abrt
|
|
Nikola Pajkovsky |
8750f03 |
|
|
Nikola Pajkovsky |
8750f03 |
-wspace='[ ]*'
|
|
Nikola Pajkovsky |
8750f03 |
-DUMP_LOCATION=`grep "^${wspace}DumpLocation${wspace}=" @sysconfdir@/abrt/abrt.conf \
|
|
Nikola Pajkovsky |
8750f03 |
- | sed -e "s/^${wspace}DumpLocation${wspace}=${wspace}//" -e "s/${wspace}\$//"`
|
|
Nikola Pajkovsky |
8750f03 |
+DUMP_LOCATION=`cat @sysconfdir@/abrt/abrt.conf | grep '^[ ]*DumpLocation'`
|
|
Nikola Pajkovsky |
8750f03 |
+DUMP_LOCATION=${DUMP_LOCATION#*DumpLocation*=}
|
|
Nikola Pajkovsky |
8750f03 |
+DUMP_LOCATION=${DUMP_LOCATION// /}
|
|
Nikola Pajkovsky |
8750f03 |
|
|
Nikola Pajkovsky |
8750f03 |
-if [ x"$DUMP_LOCATION" = x"" ]; then
|
|
Nikola Pajkovsky |
8750f03 |
+if [ "$DUMP_LOCATION" = "" ]; then
|
|
Nikola Pajkovsky |
8750f03 |
DUMP_LOCATION=$DEFAULT_LOCATION
|
|
Nikola Pajkovsky |
8750f03 |
-else
|
|
Nikola Pajkovsky |
8750f03 |
- if [ x"${DUMP_LOCATION#* }" != x"$DUMP_LOCATION" ]; then
|
|
Nikola Pajkovsky |
8750f03 |
- # DUMP_LOCATION has a space.
|
|
Nikola Pajkovsky |
8750f03 |
- DUMP_LOCATION=$DEFAULT_LOCATION
|
|
Nikola Pajkovsky |
8750f03 |
- fi
|
|
Nikola Pajkovsky |
8750f03 |
fi
|
|
Nikola Pajkovsky |
8750f03 |
|
|
Nikola Pajkovsky |
8750f03 |
PATTERN_FILE="/proc/sys/kernel/core_pattern"
|
|
Nikola Pajkovsky |
8750f03 |
--
|
|
Nikola Pajkovsky |
8750f03 |
1.7.6
|
|
Nikola Pajkovsky |
8750f03 |
|