From 30ee13146ebfe4fb12d2f2b6795b6a54846d1d4f Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Tue, 10 Apr 2018 17:04:08 -0700 Subject: [PATCH] travis: fix postgres credentials --- bin/run-mastodon.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/run-mastodon.js b/bin/run-mastodon.js index 2bb6415a..14f53cd8 100644 --- a/bin/run-mastodon.js +++ b/bin/run-mastodon.js @@ -44,12 +44,14 @@ async function cloneMastodon () { async function setupMastodonDatabase () { console.log('Setting up mastodon database...') try { - await exec(`dropdb -h 127.0.0.1 -U ${DB_USER} mastodon_development`, {cwd: mastodonDir}) + await exec(`dropdb -h 127.0.0.1 -U ${DB_USER} --no-password mastodon_development`, {cwd: mastodonDir}) } catch (e) { /* ignore */ } - await exec(`createdb -h 127.0.0.1 -U ${DB_USER} mastodon_development`, {cwd: mastodonDir}) + await exec(`createdb -h 127.0.0.1 -U ${DB_USER} --no-password mastodon_development`, {cwd: mastodonDir}) let dumpFile = path.join(dir, '../fixtures/dump.sql') - await exec(`pg_restore -h 127.0.0.1 -U ${DB_USER} -Fc -d mastodon_development "${dumpFile}"`, {cwd: mastodonDir}) + await exec(`pg_restore -h 127.0.0.1 -U ${DB_USER} --no-password -Fc -d mastodon_development "${dumpFile}"`, { + cwd: mastodonDir + }) let tgzFile = path.join(dir, '../fixtures/system.tgz') let systemDir = path.join(mastodonDir, 'public/system')