diff --git a/.bash_rc.d/00.commands.sh b/.bash_rc.d/00.commands.sh index 2ed965a..1513904 100644 --- a/.bash_rc.d/00.commands.sh +++ b/.bash_rc.d/00.commands.sh @@ -103,17 +103,17 @@ function get_cabal_depends() { } function insert_path_element() { - remove_element_from_var $1 PATH - insert_element_into_var $1 PATH + remove_element_from_var "$1" PATH + insert_element_into_var "$1" PATH } function insert_path_element_before() { - remove_element_from_var $1 PATH - insert_element_at_front_of_var $1 PATH + remove_element_from_var "$1" PATH + insert_element_at_front_of_var "$1" PATH } function remove_path_element() { - remove_element_from_var $1 PATH + remove_element_from_var "$1" PATH } function insert_element_at_front_of_var () { @@ -146,8 +146,9 @@ function remove_element_from_var() { eval varcontents=\$"$2" eval varname="$2" newcomp="$1" - if echo "$varcontents" | grep "$newcomp:" >> /dev/null; then - export $varname="`echo $varcontents | sed s%$newcomp:%%`" + if echo "${varcontents}" | grep "${newcomp}:" >> /dev/null; then + newvarcontents="$(echo "${varcontents}" | sed "s%${newcomp}:%%")" + export $varname="${newvarcontents}" elif [[ "$varcontents" == "$newcomp" ]] ; then unset $varname fi diff --git a/.bash_rc.d/99.darwin.sh b/.bash_rc.d/99.darwin.sh index d2ee64a..5ac85c9 100644 --- a/.bash_rc.d/99.darwin.sh +++ b/.bash_rc.d/99.darwin.sh @@ -22,6 +22,7 @@ if [ -d "/opt/brew" ]; then # setup brew cgo flags so that it can find brew libs fi -insert_path_element_before /Users/jwall/Library/Python/3.7/bin +insert_path_element_before /Applications/Julia-1.6.app/Contents/Resources/julia/bin +insert_path_element_before "/Applications/Visual Studio Code.app/Contents/Resources/app/bin" fi # end darwin module diff --git a/restore.sh b/restore.sh index b8441f4..757baf6 100644 --- a/restore.sh +++ b/restore.sh @@ -30,14 +30,14 @@ touch ~/.hgauth rm -f ~/restore.sh # setup my hg cacerts -openssl req -new -x509 \ - -nodes \ - -extensions v3_ca \ - -keyout /dev/null \ - -out dummycert.pem \ - -subj "C=US/ST=Illinois/L=Chicago/O=Marzhillstudios/CN=jeremy.marzhillstudios.com" \ - -days 3650 -sudo mv dummycert.pem /etc/hg-dummy-cert.pem +#openssl req -new -x509 \ +# -nodes \ +# -extensions v3_ca \ +# -keyout /dev/null \ +# -out dummycert.pem \ +# -subj "C=US/ST=Illinois/L=Chicago/O=Marzhillstudios/CN=jeremy.marzhillstudios.com" \ +# -days 3650 +#sudo mv dummycert.pem /etc/hg-dummy-cert.pem # essential libs