[F] Support both .pgpass and --no-password pg_dump

castiron · Dec 17, 2018 · 17f662c · 17f662c
1 parent 82e22de
commit 17f662c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/add-config b/add-config
@@ -54,7 +54,7 @@ main() {
     echo "Database user:"
     read database_user
 
-    echo "Database password:"
+    echo "Database password (use .pgpass if using PostgreSQL but supply arbitrary value here):"
     read -s database_password
 
 cat << CONFIG

diff --git a/donut b/donut
@@ -128,10 +128,15 @@ main() {
                 echo "" > ${tmp_db_config}
                 ;;
             postgresql)
+                if [ -z ${password} ]; then
+                    password="--no-password"
+                else
+                    password=""
+                fi
                 if [ -z ${host} ]; then
-                    pg_dump -U${user} --no-password  ${schema} > ${backup_file}
+                    pg_dump -U${user} ${password} ${schema} > ${backup_file}
                 else
-                    pg_dump -h${host} -U${user} --no-password  ${schema} > ${backup_file}
+                    pg_dump -h${host} -U${user} ${password} ${schema} > ${backup_file}
                 fi
                 ;;
             *)