--- /etc/profile.orig	2005-08-08 22:18:57.000000000 +0900
+++ /etc/profile	2005-08-08 22:22:23.000000000 +0900
@@ -1,53 +1,19 @@
-# /etc/profile
-umask 022
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin:/usr/games"
-[ "$UID" = "0" ] || PATH="$HOME/.dist/bin:$PATH:."
-export PATH
-# Change PAGER
-if [ -x /usr/bin/most ]; then
-    PAGER=/usr/bin/most
-    export PAGER
-fi
-# Set LOCALE
-if [ -f /etc/sysconfig/i18n ]; then
-    . /etc/sysconfig/i18n
-    [ -n "$LANG" ] || LANG="de_DE@euro"
-    export LANG
-    [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
-    [ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
-    [ -n "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES
-    [ -n "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC
-    [ -n "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY
-    [ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME
-    [ -n "$LC_ALL" ] && export LC_ALL || unset LC_ALL
-    [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
-    [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS
-    [ -n "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:"
+[ "$UID" = "0" ] && PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
 
-    if [ -n "$SYSFONTACM" ]; then
-	case $SYSFONTACM in
-	    iso01*|iso02*|iso15*|koi*|latin2-ucw*)
-		if [ "$TERM" = "linux" ]; then
-		    if ls -l /proc/$$/fd/0 2>/dev/null | grep -- '-> /dev/tty[0-9]*$' >/dev/null 2>&1; then
-			echo -n -e '\033(K' > /proc/$$/fd/0
-		    fi
-		fi
-		;;
-	esac
-    fi
-    unset SYSFONTACM
+if [ "$BASH" ]; then
+  PS1='\u@\h:\w\$ '
+else
+  if [ "`id -u`" -eq 0 ]; then
+    PS1='# '
+  else
+    PS1='$ '
+  fi
 fi
-# END LOCALE
-# enable bash completion in interactive shells
-[ "$PS1" -a -f /etc/bash_completion ] && . /etc/bash_completion
-PS1="\u@\h:\w\\$ "
-alias ..="cd .."
-alias which="type -path"
-alias where="type -all"
-alias ll="ls -l --color=auto"
-alias l="ls -a --color=auto"
-alias rm="rm -i"
-alias mv="mv -i"
-alias cp="cp -i"
-alias la="ls -la --color=auto"
-alias ls="ls --color=auto"
+
+export PATH PS1
+
+umask 022