@@ -49,11 +49,11 @@ export class Entry extends Command {
49
49
}
50
50
51
51
const { args, flags } = this . parse ( Entry ) ;
52
- const dataDir = flags [ "data-dir" ] || path . join ( os . homedir ( ) , ".code-server" ) ;
53
- const workingDir = args [ "workdir" ] ;
52
+ const dataDir = path . resolve ( flags [ "data-dir" ] || path . join ( os . homedir ( ) , ".code-server" ) ) ;
53
+ const workingDir = path . resolve ( args [ "workdir" ] ) ;
54
54
55
55
setupNativeModules ( dataDir ) ;
56
- const builtInExtensionsDir = path . join ( buildDir || path . join ( __dirname , ".." ) , "build/extensions" ) ;
56
+ const builtInExtensionsDir = path . resolve ( buildDir || path . join ( __dirname , ".." ) , "build/extensions" ) ;
57
57
if ( flags [ "bootstrap-fork" ] ) {
58
58
const modulePath = flags [ "bootstrap-fork" ] ;
59
59
if ( ! modulePath ) {
@@ -84,8 +84,8 @@ export class Entry extends Command {
84
84
const logDir = path . join ( dataDir , "logs" , new Date ( ) . toISOString ( ) . replace ( / [ - : . T Z ] / g, "" ) ) ;
85
85
process . env . VSCODE_LOGS = logDir ;
86
86
87
- const certPath = flags . cert ;
88
- const certKeyPath = flags [ "cert-key" ] ;
87
+ const certPath = flags . cert ? path . resolve ( flags . cert ) : undefined ;
88
+ const certKeyPath = flags [ "cert-key" ] ? path . resolve ( flags [ "cert-key" ] ) : undefined ;
89
89
90
90
if ( certPath && ! certKeyPath ) {
91
91
logger . error ( "'--cert-key' flag is required when specifying a certificate!" ) ;
@@ -135,9 +135,9 @@ export class Entry extends Command {
135
135
}
136
136
} ) ;
137
137
138
- let password = flags [ " password" ] ;
138
+ let password = flags . password ;
139
139
if ( ! password ) {
140
- // Generate a random password
140
+ // Generate a random password with a length of 24.
141
141
const buffer = Buffer . alloc ( 12 ) ;
142
142
randomFillSync ( buffer ) ;
143
143
password = buffer . toString ( "hex" ) ;
@@ -158,7 +158,7 @@ export class Entry extends Command {
158
158
// If we're not running from the binary and we aren't serving the static
159
159
// pre-built version, use webpack to serve the web files.
160
160
if ( ! isCli && ! serveStatic ) {
161
- const webpackConfig = require ( path . join ( __dirname , ".." , ".." , "web" , "webpack.config.js" ) ) ;
161
+ const webpackConfig = require ( path . resolve ( __dirname , ".." , ".." , "web" , "webpack.config.js" ) ) ;
162
162
const compiler = require ( "webpack" ) ( webpackConfig ) ;
163
163
app . use ( require ( "webpack-dev-middleware" ) ( compiler , {
164
164
logger,
0 commit comments