refactor: use app.commandLine.getSwitchValue() for parsing user-data-dir (electron#18764)

miniak · MarshallOfSound · commit da58ac7c20f9 · 2019-06-13T16:03:02.000-07:00
diff --git a/lib/browser/api/app.ts b/lib/browser/api/app.ts
@@ -51,10 +51,8 @@ app._setDefaultAppPaths = (packagePath) => {
   app.setAppPath(packagePath)
 
   // Add support for --user-data-dir=
-  const userDataDirFlag = '--user-data-dir='
-  const userDataArg = process.argv.find(arg => arg.startsWith(userDataDirFlag))
-  if (userDataArg) {
-    const userDataDir = userDataArg.substr(userDataDirFlag.length)
+  if (app.commandLine.hasSwitch('user-data-dir')) {
+    const userDataDir = app.commandLine.getSwitchValue('user-data-dir')
     if (path.isAbsolute(userDataDir)) app.setPath('userData', userDataDir)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,8 @@ app._setDefaultAppPaths = (packagePath) => {`
`51`	`51`	`app.setAppPath(packagePath)`
`52`	`52`
`53`	`53`	`// Add support for --user-data-dir=`
`54`		`- const userDataDirFlag = '--user-data-dir='`
`55`		`- const userDataArg = process.argv.find(arg => arg.startsWith(userDataDirFlag))`
`56`		`- if (userDataArg) {`
`57`		`- const userDataDir = userDataArg.substr(userDataDirFlag.length)`
	`54`	`+ if (app.commandLine.hasSwitch('user-data-dir')) {`
	`55`	`+ const userDataDir = app.commandLine.getSwitchValue('user-data-dir')`
`58`	`56`	`if (path.isAbsolute(userDataDir)) app.setPath('userData', userDataDir)`
`59`	`57`	`}`
`60`	`58`	`}`