Merge pull request #74 from helloitsjoe/swap-local-and-environment

Swap .env.local and .env.<environment> priority

README.md

@@ -37,7 +37,7 @@ $ dotenv -e .env3 -e .env4 <command with arguments>
 ```
 
 ### Cascading env variables
-Some applications load from `.env`, `.env.local`, `.env.development` and `.env.development.local`
+Some applications load from `.env`, `.env.development`, `.env.local`, and `.env.development.local`
 (see [#37](https://github.com/entropitor/dotenv-cli/issues/37) for more information).
 `dotenv-cli` supports this using the `-c` flag for just `.env` and `.env.local` and `-c development` for the ones above.
 

cli.js

@@ -17,7 +17,7 @@ function printHelp () {
     '  -v <name>=<value>   put variable <name> into environment using value <value>',
     '  -v <name>=<value>   multiple -v flags are allowed',
     '  -p <variable>       print value of <variable> to the console. If you specify this, you do not have to specify a `command`',
-    '  -c [environment]    support cascading env variables from `.env`, `.env.local`, `.env.<environment>`, `.env.<environment>.local` files',
+    '  -c [environment]    support cascading env variables from `.env`, `.env.<environment>`, `.env.local`, `.env.<environment>.local` files',
     '  command             `command` is the actual command you want to run. Best practice is to precede this command with ` -- `. Everything after `--` is considered to be your command. So any flags will not be parsed by this tool but be passed to your command. If you do not do it, this tool will strip those flags'
   ].join('\n'))
 }
@@ -41,7 +41,7 @@ if (argv.e) {
 if (argv.c) {
   paths = paths.reduce((accumulator, path) => accumulator.concat(
     typeof argv.c === 'string'
-      ? [`${path}.${argv.c}.local`, `${path}.${argv.c}`, `${path}.local`, path]
+      ? [`${path}.${argv.c}.local`, `${path}.local`, `${path}.${argv.c}`, path]
       : [`${path}.local`, path]
   ), [])
 }