diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2007-06-10 09:59:26 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2007-06-10 09:59:26 +0000 |
| commit | 8db657b6ea5d6109cdca6216e44ed933201a42e5 (patch) | |
| tree | 71fbe5efbb00b2d16af38db0990a174fb6c50d72 /localdumpsql | |
| parent | dc53363a43c0b5818e0df98f6d3c0c7538721e12 (diff) | |
No check for /usr/lib/postgresql/bin/pg_ctl (it has changed location as is not used directly in the script anyway).
Diffstat (limited to 'localdumpsql')
| -rwxr-xr-x | localdumpsql | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/localdumpsql b/localdumpsql index 45182af..375e201 100755 --- a/localdumpsql +++ b/localdumpsql @@ -3,7 +3,7 @@ # /usr/local/sbin/localdumpsql # Copyright 2001-2006 Jonas Smedegaard <dr@jones.dk> # -# $Id: localdumpsql,v 1.16 2006-07-16 12:34:00 jonas Exp $ +# $Id: localdumpsql,v 1.17 2007-06-10 09:59:26 jonas Exp $ # # MySQL/PostgreSQL maintenance script # @@ -50,7 +50,7 @@ esac # Define paths mysql_bin=/usr/bin/mysqldump -postgres_bin=/usr/lib/postgresql/bin/pg_dump +postgres_bin=/usr/bin/pg_dump # Define routines function gethome_user() { getent passwd "$1" | awk -F: '{print $6}' | head -n 1; } @@ -65,7 +65,7 @@ function mysql_db_user() { if [ -n "$1" ]; then echo "$1"; else mysql -u root my #function mysqldump_user_db() { $mysql_bin --opt --user="root" "$2"; } function mysqldump_user_db() { $mysql_bin --add-drop-table --add-locks --all --quick --lock-tables --disable-keys --user="root" "$2"; } # Avoid --extended-insert -function postgresvalid() { [ -x $postgres_bin -a -x /usr/lib/postgresql/bin/pg_ctl ]; } +function postgresvalid() { [ -x $postgres_bin ]; } function postgres_users() { echo "root"; } #FIXME function postgres_db_user() { if [ -n "$1" ]; then echo "$1"; else su -s /bin/sh postgres -c "/usr/bin/psql -t -c 'select datname from pg_database order by datname' -d template1 | sed -e 's/ //' | grep -v '^template[01]$'"; fi; } function postgresdump_user_db() { su -s /bin/sh postgres -c "$postgres_bin -O $2"; } |