aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Allen <[email protected]>2017-07-25 18:48:44 -0500
committerMark Allen <[email protected]>2017-07-25 18:48:44 -0500
commit5daa0345916cea13ae0e82ddf7b03f58503910f8 (patch)
tree3da8dda064d5856a03466f3ac90aaf3c574c3fb6
parentb82a1a083adca9f8d84e5dfa3766f22d9077b90a (diff)
downloadkerl-5daa0345916cea13ae0e82ddf7b03f58503910f8.tar.gz
kerl-5daa0345916cea13ae0e82ddf7b03f58503910f8.tar.bz2
kerl-5daa0345916cea13ae0e82ddf7b03f58503910f8.zip
Fix up activation/deactivation
-rwxr-xr-xkerl7
1 files 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