From: Ian Kelling Date: Fri, 5 May 2017 15:44:53 +0000 (-0700) Subject: minor fixes X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=commitdiff_plain;h=1178f7e7106ada9eba91184c04533feb28f695f5 minor fixes --- diff --git a/.gitignore b/.gitignore index 5a0a5e6..d52d4c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /t.org /old-unused /.emacs.d -/repos diff --git a/brc b/brc index d82c852..8e0facb 100644 --- a/brc +++ b/brc @@ -1671,10 +1671,6 @@ fi # based on warning from rvmsudo export rvmsudo_secure_path=1 -# for other script I wrote -#export ACME_TINY_PATH=/a/opt/acme-tiny -export ACME_TINY_WRAPPER_CERT_DIR=/p/c/machine_specific/$HOSTNAME/webservercerts - if [[ -s "/usr/local/rvm/scripts/rvm" ]]; then source "/usr/local/rvm/scripts/rvm" elif [[ -s $HOME/.rvm/scripts/rvm ]]; then diff --git a/filesystem/etc/apt/detect-http-proxy b/filesystem/etc/apt/detect-http-proxy index b8ec1d9..a6d1d6f 100755 --- a/filesystem/etc/apt/detect-http-proxy +++ b/filesystem/etc/apt/detect-http-proxy @@ -21,7 +21,7 @@ if [[ -r $f ]]; then fi fi fi -if getent hosts $proxy_host && nc -z $proxy_host $proxy_port; then +if getent hosts $proxy_host && nc -z $proxy_host $proxy_port &>/dev/null; then echo $proxy_url else if [[ ! -e $f || -w $f ]]; then diff --git a/filesystem/etc/profile.d/environment.sh b/filesystem/etc/profile.d/environment.sh index ed621d6..17b3b06 100644 --- a/filesystem/etc/profile.d/environment.sh +++ b/filesystem/etc/profile.d/environment.sh @@ -1,6 +1,3 @@ -export ACME_TINY_WRAPPER_CERT_DIR=/p/c/machine_specific/$HOSTNAME/webservercerts -export ACME_TINY_PATH="/a/opt/acme-tiny/acme_tiny.py" - if [ -f $HOME/path_add-function ]; then . $HOME/path_add-function path_add /usr/sbin /usr/local/sbin /sbin diff --git a/path_add-function b/path_add-function index 9537fe7..f03451a 100644 --- a/path_add-function +++ b/path_add-function @@ -21,7 +21,7 @@ path_add() { local help="usage: path_add [options] PATH --help: print this --end: adds to end of path, which will give it lowest priority ---ifexists: add to path only if the directory exists" +--force: add to path even if directory does not exist" local found x y z ifexists end loop newpath force=false end=false @@ -67,7 +67,6 @@ path_add() { unset IFS PATH="$newpath" for x in "$@"; do - x="$(readlink -f "$x")" if $force || [ -d "$x" ]; then if [ ! "$PATH" ]; then PATH="$x"