minor fixes

diff --git a/.gitignore b/.gitignore
index 5a0a5e6fb50ac2ab008d98d39ef25b8a82ca6596..d52d4c66d7fbe965f8ef4fbee8734f28fb7d3b7a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /t.org
 /old-unused
 /.emacs.d
-/repos

diff --git a/brc b/brc
index d82c852204879cc3d0b55d85547a90630c5c67fb..8e0facb52d8359f589da973ee946b69c5ae4d4f3 100644 (file)
--- 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 b8ec1d94ea39b01708b241e80ffb8078cdc08275..a6d1d6fb77fa00b08ca1a7286fa40fcb9e9f4253 100755 (executable)
--- 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 ed621d6ad409caf6ab1daabc8bf8065688d0af3b..17b3b06208c82b19a1a1a94c61e92658a33add9d 100644 (file)
--- 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 9537fe73076a308e22000c53b95902f00f7f7fbb..f03451abb1f4237e2438e0fb0c4e54085bcad7bc 100644 (file)
--- 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"