summaryrefslogtreecommitdiff
path: root/localdumpsql
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2002-02-18 03:17:36 +0000
committerJonas Smedegaard <dr@jones.dk>2002-02-18 03:17:36 +0000
commit5ea1b4612adb95cbbe3aef9598474b851bad1815 (patch)
tree904dc21c42dd7e7f224b0cfbd83cbd822e805bd2 /localdumpsql
parentb99d965131d2ee40b23faa6cd88561aa5b0540e6 (diff)
localdumpsql: Make sure not only postgresql-client is installed before looking for databases.
Diffstat (limited to 'localdumpsql')
-rwxr-xr-xlocaldumpsql4
1 files changed, 2 insertions, 2 deletions
diff --git a/localdumpsql b/localdumpsql
index 9639911..e6129b8 100755
--- a/localdumpsql
+++ b/localdumpsql
@@ -41,12 +41,12 @@ mysql_bin=/usr/bin/mysqldump
postgres_bin=/usr/lib/postgresql/bin/pg_dump
# Define routines
-function mysql_valid() { [ -f $mysql_bin ]; }
+function mysql_valid() { [ -x $mysql_bin ]; }
function mysql_get_pw() { grep password /root/.my.cnf | awk -F= '{print $2}' | head -1 | sed 's/^ //g'; }
function mysql_list_db() { echo "show databases"|mysql -uroot -p`mysql_get_pw`|grep -v '^Database$'; }
function mysql_dump_db() { $mysql_bin -c --add-drop-table -uroot -p`mysql_get_pw` $1; }
-function postgres_valid() { [ -f $postgres_bin ]; }
+function postgres_valid() { [ -x $postgres_bin -a -x /usr/lib/postgresql/bin/pg_ctl ]; }
function postgres_list_db() { 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]$'"; }
function postgres_dump_db() { su -s /bin/sh postgres -c "$postgres_bin $1"; }