From 2037eeab5500780fb18332cd7706c241a5538819 Mon Sep 17 00:00:00 2001 From: JohnE Date: Fri, 31 Mar 2017 09:18:32 -0700 Subject: [PATCH] MOD: fixed openssl, default now overrides apples --- .bash_crypto | 2 +- .bash_override | 6 ++++++ .bash_profile | 1 + .bash_python | 8 ++++---- 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 .bash_override diff --git a/.bash_crypto b/.bash_crypto index 3fa56bd..b619761 100644 --- a/.bash_crypto +++ b/.bash_crypto @@ -1,6 +1,6 @@ # brew openssl # openssl_ -> /usr/local/Cellar/openssl/1.0.2e_1/bin/openssl -export OSSL=/usr/local/Cellar/openssl/openssl +export OSSL=/usr/local/opt/openssl/bin/openssl #openssl alias ossl=$OSSL diff --git a/.bash_override b/.bash_override new file mode 100644 index 0000000..e8a6c6f --- /dev/null +++ b/.bash_override @@ -0,0 +1,6 @@ +# +# these will override any other setting +# + +# override Apple's default (old) openssl +export PATH="/usr/local/opt/openssl/bin:$PATH" diff --git a/.bash_profile b/.bash_profile index e5f946b..04a8786 100644 --- a/.bash_profile +++ b/.bash_profile @@ -10,6 +10,7 @@ source ~/.bash_tools source ~/.bash_dev source ~/.bash_android source ~/.bash_python +source ~/.bash_override # prompt PS1="[\u@\h:\W] " diff --git a/.bash_python b/.bash_python index 5fbbd3f..84278ee 100644 --- a/.bash_python +++ b/.bash_python @@ -13,10 +13,6 @@ venv.ls () { ll $SRC_DIRECTORY } -# django -alias djm="python ./manage.py" -alias dja="django-admin.py" - # python interpreter w/auto complete # pip install bpython bbpython () { @@ -24,6 +20,10 @@ bbpython () { bpython } +# django +# alias djm="python ./manage.py" +# alias dja="django-admin.py" + # virtualenv # export WORKON_HOME=$HOME/dev/virtenvs # source /usr/local/bin/virtualenvwrapper.sh