projects
/
henge
/
kiak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:Jlavatai/strapp
[henge/kiak.git]
/
opts.js
diff --git
a/opts.js
b/opts.js
index
e97d84e
..
d930e79
100644
(file)
--- a/
opts.js
+++ b/
opts.js
@@
-13,26
+13,25
@@
const path = require('path')
*/
exports = require('minimist')(process.argv.slice(2), {
string: [ 'config', 'client-js', 'host-js', 'ca-cert', 'ca-key',
*/
exports = require('minimist')(process.argv.slice(2), {
string: [ 'config', 'client-js', 'host-js', 'ca-cert', 'ca-key',
- 'port', '
index', 'bind', 'electron
', 'dedicated'
+ 'port', '
bind', 'electron', 'file-dir
', 'dedicated'
],
boolean: [ 'no-tls', 'legacy-socket' ],
alias: { c: 'config',
j: 'client-js',
J: 'host-js',
],
boolean: [ 'no-tls', 'legacy-socket' ],
alias: { c: 'config',
j: 'client-js',
J: 'host-js',
- T: 'no-tls',
C: 'ca-cert',
K: 'ca-key',
p: 'port',
C: 'ca-cert',
K: 'ca-key',
p: 'port',
- i: 'index',
b: 'bind',
e: 'electron',
b: 'bind',
e: 'electron',
- d: 'dedicated'
+ d: 'file-dir',
+ D: 'dedicated'
},
stopEarly: true,
unknown: (opt) => {
console.log('Unknown operator: ' + opt)
console.log(process.argv.join(' '))
},
stopEarly: true,
unknown: (opt) => {
console.log('Unknown operator: ' + opt)
console.log(process.argv.join(' '))
- console.log(fs.readFileSync('./usage'))
+ console.log(fs.readFileSync('./usage'
, { encoding: 'utf8' }
))
process.exit()
}
})
process.exit()
}
})
@@
-42,15
+41,15
@@
exports = require('minimist')(process.argv.slice(2), {
*/
exports['defaults'] = {
config: '/etc/strapp.conf:~/.strapp/strapp.conf:./strapp.conf',
*/
exports['defaults'] = {
config: '/etc/strapp.conf:~/.strapp/strapp.conf:./strapp.conf',
- 'client-js': './client.js',
- 'host-js': './host.js',
+ 'client-js': './client
-test
.js',
+ 'host-js': './host
-test
.js',
tls: true,
'ca-cert': '../certs/cert.pem',
'ca-key': '../certs/key.pem',
port: 2443,
tls: true,
'ca-cert': '../certs/cert.pem',
'ca-key': '../certs/key.pem',
port: 2443,
- index: './www/index.html',
bind: 'www:./www',
electron: undefined,
bind: 'www:./www',
electron: undefined,
+ 'file-dir': undefined,
dedicated: undefined,
'legacy-socket': false
}
dedicated: undefined,
'legacy-socket': false
}
@@
-97,7
+96,7
@@
exports['bind'].replace(/\s/g,'').split(',').forEach((kvp) => {
kv[1] = path.resolve(kv[1])
if (fs.existsSync(kv[1])) {
if (kv.length == 2 && /^[-_.A-Za-z0-9]/g.test(kv[0]))
kv[1] = path.resolve(kv[1])
if (fs.existsSync(kv[1])) {
if (kv.length == 2 && /^[-_.A-Za-z0-9]/g.test(kv[0]))
- exports['bindings'][kv[0]] =
kv[1]
+ exports['bindings'][kv[0]] =
path.normalize(kv[1])
else
console.log(`WARN: Invalid binding: ${kvp}`)
}
else
console.log(`WARN: Invalid binding: ${kvp}`)
}