21c21,30
<     if (!options.password) exit('missing --password');
---
>     if (!options.password) {
>         if (!options.passwordFile) {
>             exit('missing --password and --password-file');
>         }
>         var password = safe.require(path.resolve(options.passwordFile));
>         if (!password) {
>             exit('No password found or password file invalid');
>         }
>         options.password = password;
>     }
43c52,61
<     if (!options.password) exit('missing --password');
---
>     if (!options.password) {
>         if (!options.passwordFile) {
>             exit('missing --password and --password-file');
>         }
>         var password = safe.require(path.resolve(options.passwordFile));
>         if (!password) {
>             exit('No password found or password file invalid');
>         }
>         options.password = password;
>     }
89a108
>     .option('--password-file <fileName>', 'Password file')
96a116
>     .option('--password-file <fileName>', 'Password file')