diff --git a/dist/dump-linux b/dist/dump-linux index 8d05b2d..e4fbe8e 100755 Binary files a/dist/dump-linux and b/dist/dump-linux differ diff --git a/dist/dump-macos b/dist/dump-macos index 9474502..70101d0 100755 Binary files a/dist/dump-macos and b/dist/dump-macos differ diff --git a/dist/restore-linux b/dist/restore-linux index 6a11518..49ea1d0 100755 Binary files a/dist/restore-linux and b/dist/restore-linux differ diff --git a/dist/restore-macos b/dist/restore-macos index 3ed662c..339c74e 100755 Binary files a/dist/restore-macos and b/dist/restore-macos differ diff --git a/src/restore.js b/src/restore.js index 3199947..a6cfa1f 100755 --- a/src/restore.js +++ b/src/restore.js @@ -69,13 +69,14 @@ if (isDocker) { var containerName = databaseName.substr(0, databaseName.lastIndexOf('-')) + '-mongo-1' var containerId = exec('docker ps -q -f name="' + containerName + '"') - if (!containerId) { + if (containerId) { console.error( color( 'Database docker container "' + containerName + '" not found!', 'red' ) ) + console.error(color('Have you started the project\'s docker containers?', 'red')) process.exit(1) } var hasDatabaseDataDir = exists('./data/db/') @@ -83,6 +84,7 @@ if (isDocker) { console.error( color('Could not find ./data/db directory to restore dump!', 'red') ) + console.error(color('Please restore from the project root.', 'red')) process.exit(1) } exec('mkdir -p ./data/db' + tmpPath) @@ -113,6 +115,8 @@ if (isDocker) { tmpPath + 'indexes' ) + } else { + log('Not restoring indexes') } } else { exec('mkdir -p ' + tmpPath) @@ -131,8 +135,10 @@ if (isDocker) { if (!noIndex && exists(tmpPath + 'indexes')) { log('Restoring Indexes') exec('mongo --norc ' + databaseName + ' ' + tmpPath + 'indexes') + } else { + log('Not restoring indexes') } } -log('Clearing up') +log('Done, cleaning up') exec('rm -rf ' + tmpPath) exec('rm -rf ./data/db' + tmpPath)