fixed dotenv

Author: Stefan

Makefile

@@ -1,5 +1,8 @@
-dump:
-	/usr/local/mysql/bin/mysqldump -u root teachen --default-character-set=utf8mb4 -r backup/teachen-db.sql
+SHELL := DOTENV_DEFAULT=.env ./dotenv /bin/sh
 
+localdump:
+	/usr/local/mysql/bin/mysqldump -u root teachen --default-character-set=utf8mb4 -r backup/teachen-db.sql
 pull:
-	sudo -H -u teachen git pull
+	git pull
+dump:
+	mysqldump -u $$DB_USER $$DB_NAME -p$$DB_PASSWORD -h $$DB_HOST --set-gtid-purged=OFF --column-statistics=0 --default-character-set=utf8mb4 -r backup/teachen-db.sql

backup/teachen-db.sql

@@ -463,4 +463,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-04-03 15:38:09
+-- Dump completed on 2020-04-03 15:43:09

dotenv

@@ -0,0 +1,89 @@
+#!/bin/sh
+# Filename:      dotenv
+# Purpose:       import environment variables from .env file and make available to other commands
+# Authors:       Jason Leung ([email protected]), multiple contributors (https://github.com/madcoda/dotenv-shell/graphs/contributors)
+# Bug-Reports:   see https://github.com/madcoda/dotenv-shell/issues
+# License:       This file is licensed under the MIT License (MIT).
+################################################################################
+
+
+set -e
+
+log_verbose() {
+  if [ "$VERBOSE" = 1 ]; then
+    echo "[dotenv.sh] $1" >&2
+  fi
+}
+
+is_set() {
+  eval val=\""\$$1"\"
+  if [ -z "$(eval "echo \$$1")" ]; then
+    return 1
+  else
+    return 0
+  fi
+}
+
+is_comment() {
+  case "$1" in
+  \#*)
+    log_verbose "Skip: $1"
+    return 0
+    ;;
+  esac
+  return 1
+}
+
+is_blank() {
+  case "$1" in
+  '')
+    log_verbose "Skip: $1"
+    return 0
+    ;;
+  esac
+  return 1
+}
+
+export_envs() {
+  while IFS='=' read -r key temp || [ -n "$key" ]; do
+    if is_comment "$key"; then
+      continue
+    fi
+
+    if is_blank "$key"; then
+      continue
+    fi
+
+        value=$(eval echo "$temp")
+        eval export "$key='$value'";
+  done < $1
+}
+
+# inject any defaults into the shell
+if is_set "DOTENV_DEFAULT"; then
+  log_verbose "Setting defaults via $DOTENV_DEFAULT"
+  if [ -f "$DOTENV_DEFAULT" ]; then
+    export_envs "$DOTENV_DEFAULT"
+  else
+    echo '$DOTENV_DEFAULT file not found'
+  fi
+fi
+
+if is_set "DOTENV_FILE"; then
+  log_verbose "Reading from $DOTENV_FILE"
+else
+  DOTENV_FILE=".env"
+fi
+
+# inject .env configs into the shell
+if [ -f "$DOTENV_FILE" ]; then
+  export_envs "$DOTENV_FILE"
+else
+  echo "$DOTENV_FILE file not found"
+fi
+
+
+# then run whatever commands you like
+if [ $# -gt 0 ]; then
+  exec "$@"
+fi