From: Michael Prokop <mika@grml.org>
Date: Sun, 28 Oct 2007 14:45:57 +0000 (+0100)
Subject: zsh-login: drop the hostname
X-Git-Tag: 1.0.21
X-Git-Url: http://git.grml.org/?p=grml-scripts.git;a=commitdiff_plain;h=1f10980f818bf4dc554a901642bda49ae9f3a5ec

zsh-login: drop the hostname
---

diff --git a/debian/changelog b/debian/changelog
index 58accc9..1e46701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-scripts (1.0.21) unstable; urgency=low
+
+  * zsh-login: drop the hostname in the welcome message as
+    the grml-version should provide it already.
+
+ -- Michael Prokop <mika@grml.org>  Sun, 28 Oct 2007 15:44:20 +0100
+
 grml-scripts (1.0.20) unstable; urgency=low
 
   * grml-hostname: adjust /etc/mailname as well
diff --git a/usr_bin/zsh-login b/usr_bin/zsh-login
index 30d277b..c4787ec 100755
--- a/usr_bin/zsh-login
+++ b/usr_bin/zsh-login
@@ -4,13 +4,12 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Jun 23 23:53:09 CEST 2007 [mika]
+# Latest change: Son Okt 28 15:44:09 CET 2007 [mika]
 ################################################################################
 
 . /etc/grml/sh-lib
 
 [ -r /etc/grml_version ] && GRMLVERSION=$(cat /etc/grml_version) || GRMLVERSION='(no version information available)'
-[ -r /etc/hostname ] && HOSTNAME=$(cat /etc/hostname) || HOSTNAME='grml'
 
 # allow customized release information
 [ -r /etc/release_info ] && cat /etc/release_info
@@ -53,7 +52,7 @@ if grep nowelcome /proc/cmdline 2>/dev/null ; then
 else
    echo "
 
-Welcome to $HOSTNAME ${GRMLVERSION}!
+Welcome to ${GRMLVERSION}!
 
 New to grml? Want to read some documentation?
 Start via running 'grml-info'.