From: Paweł Gołaszewski <blues@pld-linux.org>
Date: Thu, 26 May 2005 18:27:14 +0000 (+0000)
Subject: - setting PS1 moved to *rc of each shell. What with ksh93? There is no rc
X-Git-Tag: setup_2_4_11~47
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=861866fcd76f44d29da71c77689d1d7f1a00a1e7;p=projects%2Fsetup.git

- setting PS1 moved to *rc of each shell. What with ksh93? There is no rc
  file...; added safetp service (exotic encrypted ftp)

Changed files:
    etc/profile -> 1.48
    etc/services -> 1.48
---

diff --git a/etc/profile b/etc/profile
index 8368098..10df5f1 100644
--- a/etc/profile
+++ b/etc/profile
@@ -50,31 +50,9 @@ fi
 
 case "$SH" in
   bash)
-	case $TERM in
-		gnome|rxvt|xterm*)
-			PS1="\[\033]0;\u@\h: \w\007\][\u@\h \W]\\$ "
-			;;
-		*)
-			PS1="[\u@\h \W]\\$ "
-			;;
-	esac
+  	# currently - nothing
 	;;
   ksh|pdksh)
-	if [ `id -u` -eq 0 ]; then
-		PS1='[${LOGNAME-$USER}@${HOSTNAME} `
-		if [ "$PWD" = "/${PWD##*/}" ]; then
-			echo $PWD;
-		else
-			echo ${PWD##*/};
-		fi`]# '
-	else
-		PS1='[${LOGNAME-$USER}@${HOSTNAME} `
-		if [ "$PWD" = "/${PWD##*/}" ]; then
-			echo $PWD;
-		else
-			echo ${PWD##*/};
-		fi`]$ '
-	fi
 	PS2='> '
 	set -o emacs
 	bind '^I'=complete >/dev/null 2>&1
@@ -123,8 +101,6 @@ case "$SH" in
 	esac
 	;;
   zsh)
-	PS1='[%n@%m %~]%(!.#.%\$) '
-
 	# other HISTFILE, zsh uses diffrent fmt
 	HISTFILE=~/.historyz
 	# w/o this hist file won't get saved!
diff --git a/etc/services b/etc/services
index 49bf0ac..7a0a380 100644
--- a/etc/services
+++ b/etc/services
@@ -104,7 +104,7 @@ chargen          19/tcp ttytst source	# Character Generator
 chargen          19/udp ttytst source	# Character Generator
 ftp-data         20/tcp    # File Transfer [Default Data]
 ftp-data         20/udp    # File Transfer [Default Data]
-ftp              21/tcp    # File Transfer [Control]
+ftp              21/tcp safetp   # File Transfer [Control]
 ftp              21/udp    # File Transfer [Control]
 #                          Jon Postel <postel@isi.edu>
 ssh              22/tcp    # SSH Remote Login Protocol