Fixed some problems with commander and improved error handling

bin/easyvpn

@@ -15,7 +15,7 @@ program
   .option('-c, --country <name>', 'Country name')
   .option('-q, --query', 'Enable country query')
   .option('-p, --proxy <url>', 'Proxy url')
-  .option('-o, --options <options>', 'Openvpn options', list)
+  .option('-o, --openvpn_opts <openvpn_opts>', 'Openvpn options', list)
   .parse(process.argv);
 
 require('../index.js')(program);

index.js

@@ -59,16 +59,20 @@ const startOpenvpn = (options = []) => {
   logger.info('Starting openvpn...');
   const openvpn = `"${which.sync('openvpn')}"`;
   const proc = execa(openvpn, ['--config', `"${filePath}"`].concat(options), { shell: true });
+
   proc.stdout.pipe(logger.stream);
   proc.stderr.on('data', data => logger.error(data.toString()));
   proc.on('close', code => logger.info(`child process exited with code ${code}`));
 
   process.on('exit', () => proc.kill());
   process.on('SIGINT', () => proc.kill());
+
+  return proc;
 };
 
 const execute = (options) => {
   logger.info('Querying data...');
+
   ListVPNs(options.proxy)
     .then((vpns) => {
       return new Promise((resolve, reject) => {
@@ -86,8 +90,8 @@ const execute = (options) => {
     })
     .then(filter(options.country))
     .then(save)
-    .then(() => startOpenvpn(options.options))
+    .then(() => startOpenvpn(options.openvpn_opts))
     .catch(logger.error);
 };
 
-module.exports = (country, query) => execute(country, query);
+module.exports = options => execute(options);