cleanups and fixes

drupal/drupal-setup.sh

@@ -55,7 +55,6 @@ case "$cmd" in
               echo "CREATE TABLESPACE $db_name OWNER $db_user LOCATION '$db_dir';"
               echo "CREATE DATABASE $db_name OWNER $db_user TABLESPACE $db_name ENCODING 'UTF8';"
             ) | PGPASSWORD="$db_spass" @l_prefix@/bin/psql -q -U "$db_suser" -d "$db_sname" -f-
-            PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d "$db_name" -f- <$db_script
         fi
 
         #   activate configuration directory