Skip to content

Remove single quotes from parameter values on windows #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Trippnology wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove single quotes from parameter values on windows #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/utils.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MSON = require 'mongoson'

module.exports = utils = {}
utils.log = ->

utils.loggedExec = (command, next) ->
utils.log "> #{command}"
exec command, next
Expand Down Expand Up @@ -44,7 +44,7 @@ utils.restoreDatabase = (connectionString, dirName, next) ->
return next null, stdOut, stdErr

utils.makeDumpCommand = (connectionString, dirName) ->
throw "No target directory given." unless dirName
throw "No target directory given." unless dirName
throw "Target directory must be a string" unless typeof dirName is "string"
connectionParameters = utils.parseConnectionString connectionString
commandOptions = makeCommandOptions connectionParameters
Expand All @@ -54,7 +54,7 @@ utils.makeDumpCommand = (connectionString, dirName) ->
"mongodump#{argumentString}"

utils.makeRestoreCommand = (connectionString, dirName) ->
throw "No source directory given." unless dirName
throw "No source directory given." unless dirName
throw "Source directory must be a string" unless typeof dirName is "string"
actualDirName = utils.findDumpDirName dirName
utils.log "Using #{actualDirName}"
Expand All @@ -69,13 +69,13 @@ utils.findDumpDirName = (dirName) ->
dirCount = 0
for entryName in fs.readdirSync dirName
if fs.statSync("#{dirName}/#{entryName}").isDirectory()
dirCount += 1
dirCount += 1
lastDirName = entryName
switch dirCount
when 0 then return dirName # a proper dump dir
when 1 then return dirName + "/" + lastDirName # assume this one is proper
else throw new Error "#{dirName} contains multiple directories."

utils.dumpHerokuMongoHQDatabase = (appName, dirName, next) ->
utils.findHerokuMongoHQURL appName, (err, url) ->
utils.log "Using #{url}"
Expand Down Expand Up @@ -111,15 +111,19 @@ makeCommandOptions = (connParams) ->
options.password = connParams.password if connParams.password
options

makeCommandArguments = (options, object) ->
makeCommandArguments = (options, object) ->
args = []
for name, value of options
for name, value of options
args.push "--#{name}" unless value is false
args.push "#{value}" unless value is true or value is false
args.push object if object
args

makeArgumentString = (args) ->
str = ""
str += " '#{arg}'" for arg in args
for arg in args
if process.platform is 'win32'
str += " #{arg}"
else
str += " '#{arg}'"
str