docker

diff --git a/etc/profile.d/aliases b/etc/profile.d/aliases
index 62dd7d070a0391f0fac2edac2e421fe3854c862e..692bf91a1bfd84c0855fa1841147485f18d4ac4d 100644 (file)
--- a/etc/profile.d/aliases
+++ b/etc/profile.d/aliases
@@ -76,7 +76,7 @@ alias utf8_latin1='iconv -f utf8 -t latin1'
 #--------------------------------------------------------------------------------
 # vim
 #
-alias vi=vim
+which vim &>/dev/null && alias vi=vim
 
 #--------------------------------------------------------------------------------
 # xterm
@@ -92,10 +92,10 @@ alias vi=vim
 #alias torrentdir="btlaunchmanycurses.py --max_download_rate 150 --max_files_open 0"
 
 # btdownloadcurses
-alias torrent="btdownloadcurses --max_upload_rate 1 --minport 6881 --maxport 6999"
-alias torrentdir="btlaunchmanycurses --max_upload_rate 1 --minport 6881 --maxport 6999"
+which btdownloadcurses &>/dev/null && alias torrent="btdownloadcurses --max_upload_rate 1 --minport 6881 --maxport 6999"
+which btlaunchmanycurses &>/dev/null && alias torrentdir="btlaunchmanycurses --max_upload_rate 1 --minport 6881 --maxport 6999"
 
 #--------------------------------------------------------------------------------
 # debian upgrade
 #
-alias servers-upgrade='server-package.pl update,upgrade $((printf "big.cascais.loc\n";mysql -h mysql izi -NBe "select host from server where not hidden") | sort -u)'
+which server-package.pl &>/dev/null && alias servers-upgrade='server-package.pl update,upgrade $((printf "big.cascais.loc\n";mysql -h mysql izi -NBe "select host from server where not hidden") | sort -u)'

diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh
index 2747127bbc3395557b9f8d43a1fd47902b35808e..2d3623a61a1f2ae53679870814b09bc61614d359 100644 (file)
--- a/etc/profile.d/docker.sh
+++ b/etc/profile.d/docker.sh
@@ -1,13 +1,17 @@
+#
+# etc/profile.d/docker.sh
+#
 which docker > /dev/null || return 0
-if [ -z "$MYVIMRC" ]; then
-  [ -z "$DOCKER_CERT_PATH" -o ! -e "$DOCKER_CERT_PATH" ] && which docker-machine>/dev/null && docker-machine ls -q 2>/dev/null |grep -qFm1 docker && eval "$(docker-machine env docker)" 2>/dev/null
-fi
-
-export DOCKER_IP=$(perl -e '$ENV{DOCKER_HOST} =~ /\D(\d+\.\d+\.\d+\.\d+)\D/&&print $1')
 
+[ -z "$DOCKER_MACHINE_NAME" ] && DOCKER_MACHINE_NAME="docker"
 [ -d ~/ownCloud/Docker ] && export DOCKER_HOME=~/ownCloud/Docker
 [ -z "$DOCKER_HUB" ] && DOCKER_HUB=""
 
+if [ -z "$MYVIMRC" ]; then
+  [ -z "$DOCKER_CERT_PATH" -o ! -e "$DOCKER_CERT_PATH" ] && which docker-machine>/dev/null && docker-machine ls -q 2>/dev/null |grep -qFm1 "$DOCKER_MACHINE_NAME" && eval "$(docker-machine env "$DOCKER_MACHINE_NAME")" 2>/dev/null
+  export DOCKER_IP=$(perl -e '$ENV{DOCKER_HOST} =~ /\D(\d+\.\d+\.\d+\.\d+)\D/&&print $1')
+fi
+
 docker_build() {
   
   shell_help "Usage: $FUNCNAME [DIR_DOCKERFILE]" "$@" && return
@@ -107,7 +111,7 @@ _docker_cd() {
       local docker_name
       #[ -n "$
       if [ -n "$cd" ]; then
-        echo "$cd `pwd`" 1>&2
+        #echo "$cd `pwd`" 1>&2
         local pwd=`pwd`
 
         ! cd "$cd" echo 'return 1;' && return 1