From f960e2be6f01abe5f185d668be661b57051322ac Mon Sep 17 00:00:00 2001
From: Arshad Kazmi <arshadkazmi42@gmail.com>
Date: Mon, 20 May 2019 02:15:27 +0530
Subject: [PATCH] dotenv: add support for custom env file names (#7861)

---
 plugins/dotenv/README.md         | 11 +++++++++++
 plugins/dotenv/dotenv.plugin.zsh | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/plugins/dotenv/README.md b/plugins/dotenv/README.md
index e880e9d6974f..cac552485ffc 100644
--- a/plugins/dotenv/README.md
+++ b/plugins/dotenv/README.md
@@ -32,6 +32,17 @@ PORT=3001
 ```
 You can even mix both formats, although it's probably a bad idea.
 
+### ZSH_DOTENV_FILE
+
+You can also modify the name of the file to be loaded with the variable `ZSH_DOTENV_FILE`.
+If the variable isn't set, the plugin will default to use `.env`.
+For example, this will make the plugin look for files named `.dotenv` and load them:
+
+```
+# in ~/.zshrc, before Oh My Zsh is sourced:
+ZSH_DOTENV_FILE=.dotenv
+```
+
 ## Version Control
 
 **It's strongly recommended to add `.env` file to `.gitignore`**, because usually it contains sensitive information such as your credentials, secret keys, passwords etc. You don't want to commit this file, it's supposed to be local only.
diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index b701b5596c8b..89763d0ee37a 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -1,13 +1,13 @@
 source_env() {
-  if [[ -f .env ]]; then
+  if [[ -f $ZSH_DOTENV_FILE ]]; then
     # test .env syntax
-    zsh -fn .env || echo 'dotenv: error when sourcing `.env` file' >&2
+    zsh -fn $ZSH_DOTENV_FILE || echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
 
     if [[ -o a ]]; then
-      source .env
+      source $ZSH_DOTENV_FILE
     else
       set -a
-      source .env
+      source $ZSH_DOTENV_FILE
       set +a
     fi
   fi
@@ -16,4 +16,8 @@ source_env() {
 autoload -U add-zsh-hook
 add-zsh-hook chpwd source_env
 
+if [[ -z $ZSH_DOTENV_FILE ]]; then
+    ZSH_DOTENV_FILE=.env
+fi
+
 source_env