diff options
| author | Hugues Hiegel <hugues.hiegel@anevia.com> | 2015-06-18 17:27:27 +0200 |
|---|---|---|
| committer | Hugues Hiegel <hugues.hiegel@anevia.com> | 2015-06-18 17:27:27 +0200 |
| commit | e254a7c87ff4145f83ecacc98f8e4256b404b088 (patch) | |
| tree | bfc58fdce68abb35bfa76ad2232c19d7f4093e22 /zshrc | |
| parent | c3f881565bce9b145937b63d6b0e9fa027c581ed (diff) | |
| parent | 459669b7cc58abf3958e16d2df7998c1cad8e02d (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
01_Internal.zsh
Diffstat (limited to 'zshrc')
| -rw-r--r-- | zshrc | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -6,12 +6,12 @@ # # If you want to add a file, name it specifically in the form # -# $ZDOTDIR/??_*.zsh +# $ZDOTDIR/??_*.zsh # # Where "??" should be a two-digit number. # With that, file ``10_Toto.zsh'' would be parsed before # file ``20_Tutu.zsh'', allowing you ordering your scripts. -# +# # If you want to make user, host or network specific configurations, # add your specific scripts to the folders # - "sys:$(uname -s)" for OS-specific conf, @@ -38,6 +38,7 @@ HOST=$HOST:r HOST=${HOST:-$(hostname -s)} DOMAIN=$(hostname -a 2>&-| sed 's/^[^\.]*\.\?//') DOMAIN=${DOMAIN:-$(hostname -d 2>&-)} +DOMAIN=${DOMAIN:-$(hostname -y 2>&-)} [ "$DOMAIN" = "" -o "$DOMAIN" = "localdomain" -o "$DOMAIN" = "(none)" ] && DOMAIN=$(grep "^search " /etc/resolv.conf | cut -d' ' -f2) ## Agent de clefs SSH/GPG |