[postgresql] postgresql-setup: work even if $PATH is unset or empty
Pavel Raiskup
praiskup at fedoraproject.org
Fri May 16 12:21:44 UTC 2014
commit 533a1efbb605600e2d64d38d3c2419113bdd3b84
Author: Pavel Raiskup <praiskup at redhat.com>
Date: Wed May 14 13:33:10 2014 +0200
postgresql-setup: work even if $PATH is unset or empty
.. by setting $PATH to default value. Also check for command
existence by 'command' built-in instead of checking for file
existence.
Version: 9.3.4-2
Resolves: #1097317
postgresql-setup | 4 +++-
postgresql.spec | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/postgresql-setup b/postgresql-setup
index acf07f7..7ce7b9f 100755
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -2,6 +2,8 @@
#
# postgresql-setup - Initialization and upgrade operations for PostgreSQL
+test -z "$PATH" && export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
+
test x"$PGSETUP_DEBUG" != x && set -x
# PGVERSION is the full package version, e.g., 9.0.2
@@ -100,7 +102,7 @@ export PGDATA
export PGPORT
# For SELinux we need to use 'runuser' not 'su'
-if [ -x /sbin/runuser ]; then
+if command -v runuser &>/dev/null; then
SU=runuser
else
SU=su
diff --git a/postgresql.spec b/postgresql.spec
index c8b30d6..8c18fc5 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1131,6 +1131,9 @@ fi
%endif
%changelog
+* Wed May 14 2014 Pavel Raiskup <praiskup at redhat.com> - 9.3.4-2
+- set basic $PATH when it is empty or unset, (#1097317)
+
* Thu Mar 20 2014 Jozef Mlich <jmlich at redhat.com> - 9.3.4-1
- update to 9.3.4 minor version per release notes:
http://www.postgresql.org/docs/9.3/static/release-9-3-4.html
More information about the scm-commits
mailing list