Remove two incorrect trailing commas in bsock.h

[bacula/bacula] / bacula / updatedb / update_postgresql_tables_11_to_12.in

diff --git a/bacula/updatedb/update_postgresql_tables_11_to_12.in b/bacula/updatedb/update_postgresql_tables_11_to_12.in
index 8cadf7abc432783fd62b634381f074a37186316f..4a6e98292890d3a8b5ac54ccc9c501a9ed3eb49b 100644 (file)
--- a/bacula/updatedb/update_postgresql_tables_11_to_12.in
+++ b/bacula/updatedb/update_postgresql_tables_11_to_12.in
@@ -1,5 +1,8 @@
 #!/bin/sh
 #
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 # Shell script to update PostgreSQL tables from Bacula Community version 3.0.x to 5.0.0
 #
 echo " "
@@ -7,9 +10,9 @@ echo "This script will update a Bacula PostgreSQL database from version 11 to 12
 echo " which is needed to convert from Bacula Community version 3.0.x to 5.0.x"
 echo " "
 
-bindir=@SQL_BINDIR@
+bindir=@POSTGRESQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=@db_name@
+db_name=${db_name:-@db_name@}
 
 DBVERSION=`psql -d ${db_name} -t --pset format=unaligned -c "select VersionId from Version" $*`
 if [ $DBVERSION != 11 ] ; then