summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Lowther <victor.lowther@gmail.com>2008-03-15 13:54:18 -0500
committerVictor Lowther <victor.lowther@gmail.com>2008-03-15 13:54:18 -0500
commit135bc1f5858caeae2b803e1e5c220b284c45b03c (patch)
tree5d919483bc7c93ba00c3a5f00087894300f140e6
parent0234380da899b2ae52ab5d88dde9914c6f1e3170 (diff)
parentc99900e9e8bf7f909ac42f825e5f2694dc26b611 (diff)
Merge branch 'vlowther-dynamic-hook-disable' into vlowther-default-parameters
-rw-r--r--pm/pm-functions.in1
-rw-r--r--src/pm-action.in2
2 files changed, 1 insertions, 2 deletions
diff --git a/pm/pm-functions.in b/pm/pm-functions.in
index 3670df6..10dd2a9 100644
--- a/pm/pm-functions.in
+++ b/pm/pm-functions.in
@@ -139,7 +139,6 @@ run_hooks() {
elif [ -f "$phooks/$base" ]; then
hook="$phooks/$base"
fi
-
echo $(date): running ${hook} $2
hook_ok "$hook" && (
IFS="${oifs}"
diff --git a/src/pm-action.in b/src/pm-action.in
index 3872853..a6ea68c 100644
--- a/src/pm-action.in
+++ b/src/pm-action.in
@@ -38,7 +38,7 @@ help()
exit 0
}
-if [ -n "$EUID" -a "$EUID" != "0" ]; then
+if [ "$(id -u)" != "0" ]; then
echo This utility may only be run by the root user. 1>&2
exit 1
fi