From bd632628ece4542dfa2543937bb57bc7b6b82ece Mon Sep 17 00:00:00 2001
From: Mark Allen <mrallen1@yahoo.com>
Date: Thu, 22 Jun 2017 13:57:34 -0500
Subject: Add automatic shell history flag for OTP >= 20

---
 kerl | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/kerl b/kerl
index 50c33f3..eb9d6e0 100755
--- a/kerl
+++ b/kerl
@@ -717,6 +717,11 @@ do_install()
 # credits to virtualenv
 kerl_deactivate()
 {
+    if [ -n "\$_KERL_SAVED_ERL_AFLAGS" ]; then
+        ERL_AFLAGS="\$_KERL_SAVED_ERL_AFLAGS"
+        export ERL_AFLAGS
+        unset _KERL_SAVED_ERL_AFLAGS
+    fi
     if [ -n "\$_KERL_PATH_REMOVABLE" ]; then
         PATH=\`echo \${PATH} | sed -e "s#\${_KERL_PATH_REMOVABLE}:##"\`
         export PATH
@@ -894,6 +899,17 @@ endif
 
 rehash
 ACTIVATE_CSH
+
+    otpver=$(get_otp_version "$rel")
+    if [ $otpver -ge 20 ]; then
+        # https://twitter.com/mononcqc/status/877544929496629248
+        cat << OTP_20_ADDITION >> "$absdir/activate"
+_KERL_SAVED_ERL_AFLAGS="\$ERL_AFLAGS"
+export _KERL_SAVED_ERL_AFLAGS
+export ERL_AFLAGS="-kernel shell_history_enabled \$ERL_AFLAGS"
+OTP_20_ADDITION
+    fi
+
     if [ -n "$KERL_BUILD_DOCS" ]; then
         DOC_DIR="$KERL_BUILD_DIR/$1/release_$rel/lib/erlang"
         if [ -d "$DOC_DIR" ]; then
-- 
cgit v1.2.3


From b82a1a083adca9f8d84e5dfa3766f22d9077b90a Mon Sep 17 00:00:00 2001
From: Mark Allen <mrallen1@yahoo.com>
Date: Thu, 22 Jun 2017 15:57:30 -0500
Subject: Space between the option and the value

---
 kerl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kerl b/kerl
index eb9d6e0..abbe93f 100755
--- a/kerl
+++ b/kerl
@@ -906,7 +906,7 @@ ACTIVATE_CSH
         cat << OTP_20_ADDITION >> "$absdir/activate"
 _KERL_SAVED_ERL_AFLAGS="\$ERL_AFLAGS"
 export _KERL_SAVED_ERL_AFLAGS
-export ERL_AFLAGS="-kernel shell_history_enabled \$ERL_AFLAGS"
+export ERL_AFLAGS="-kernel shell_history enabled \$ERL_AFLAGS"
 OTP_20_ADDITION
     fi
 
-- 
cgit v1.2.3


From 5daa0345916cea13ae0e82ddf7b03f58503910f8 Mon Sep 17 00:00:00 2001
From: Mark Allen <mrallen1@yahoo.com>
Date: Tue, 25 Jul 2017 18:48:44 -0500
Subject: Fix up activation/deactivation

---
 kerl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/kerl b/kerl
index abbe93f..32b01db 100755
--- a/kerl
+++ b/kerl
@@ -904,9 +904,12 @@ ACTIVATE_CSH
     if [ $otpver -ge 20 ]; then
         # https://twitter.com/mononcqc/status/877544929496629248
         cat << OTP_20_ADDITION >> "$absdir/activate"
-_KERL_SAVED_ERL_AFLAGS="\$ERL_AFLAGS"
+_KERL_SAVED_ERL_AFLAGS=" \$ERL_AFLAGS"
 export _KERL_SAVED_ERL_AFLAGS
-export ERL_AFLAGS="-kernel shell_history enabled \$ERL_AFLAGS"
+kernel_history=\$(echo "\$ERL_AFLAGS" | grep "kernel shell_history")
+if [ -z "\$kernel_history" ]; then
+    export ERL_AFLAGS="-kernel shell_history enabled \$ERL_AFLAGS"
+fi
 OTP_20_ADDITION
     fi
 
-- 
cgit v1.2.3


From 4986ebe61e8a0f3aafacee2a027ea89feaed1bf7 Mon Sep 17 00:00:00 2001
From: sanmiguel <michael.coles@alertlogic.com>
Date: Thu, 3 Aug 2017 18:45:26 -0500
Subject: Always add shell_history to ERL_AFLAGS

Even for erlangs before 20.0 - it should have no effect
---
 kerl | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/kerl b/kerl
index 32b01db..986054b 100755
--- a/kerl
+++ b/kerl
@@ -768,6 +768,12 @@ REBAR_PLT_DIR="$absdir"
 export REBAR_PLT_DIR
 _KERL_ACTIVE_DIR="$absdir"
 export _KERL_ACTIVE_DIR
+# https://twitter.com/mononcqc/status/877544929496629248
+export _KERL_SAVED_ERL_AFLAGS=" \$ERL_AFLAGS"
+kernel_history=\$(echo "\$ERL_AFLAGS" | grep "kernel shell_history")
+if [ -z "\$kernel_history" ]; then
+    export ERL_AFLAGS="-kernel shell_history enabled \$ERL_AFLAGS"
+fi
 if [ -f "$KERL_CONFIG" ]; then . "$KERL_CONFIG"; fi
 if [ -n "\$KERL_ENABLE_PROMPT" ]; then
     _KERL_SAVED_PS1="\$PS1"
@@ -900,19 +906,6 @@ endif
 rehash
 ACTIVATE_CSH
 
-    otpver=$(get_otp_version "$rel")
-    if [ $otpver -ge 20 ]; then
-        # https://twitter.com/mononcqc/status/877544929496629248
-        cat << OTP_20_ADDITION >> "$absdir/activate"
-_KERL_SAVED_ERL_AFLAGS=" \$ERL_AFLAGS"
-export _KERL_SAVED_ERL_AFLAGS
-kernel_history=\$(echo "\$ERL_AFLAGS" | grep "kernel shell_history")
-if [ -z "\$kernel_history" ]; then
-    export ERL_AFLAGS="-kernel shell_history enabled \$ERL_AFLAGS"
-fi
-OTP_20_ADDITION
-    fi
-
     if [ -n "$KERL_BUILD_DOCS" ]; then
         DOC_DIR="$KERL_BUILD_DIR/$1/release_$rel/lib/erlang"
         if [ -d "$DOC_DIR" ]; then
-- 
cgit v1.2.3