aboutsummaryrefslogtreecommitdiff
path: root/files/etc
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-18 20:01:40 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-18 20:01:40 -0200
commitaf85f475cc9d1c3e04f797f6b3d6487a26802646 (patch)
tree9bbca6ad9def39a04ff68c0891f13776b137dfff /files/etc
parent4a7c7172e8725ce72df93924c4a4dcd87f75a569 (diff)
downloadpuppet-nodo-af85f475cc9d1c3e04f797f6b3d6487a26802646.tar.gz
puppet-nodo-af85f475cc9d1c3e04f797f6b3d6487a26802646.tar.bz2
Rewriting profile configuration
Diffstat (limited to 'files/etc')
-rw-r--r--files/etc/profile37
-rw-r--r--files/etc/profile.d/prompt.sh37
-rw-r--r--files/etc/profile.lenny25
3 files changed, 74 insertions, 25 deletions
diff --git a/files/etc/profile b/files/etc/profile
new file mode 100644
index 0000000..5a89ea5
--- /dev/null
+++ b/files/etc/profile
@@ -0,0 +1,37 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+if [ "`id -u`" -eq 0 ]; then
+ PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+else
+ PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
+fi
+export PATH
+
+if [ "$PS1" ]; then
+ if [ "$BASH" ]; then
+ # The file bash.bashrc already sets the default PS1.
+ # PS1='\h:\w\$ '
+ if [ -f /etc/bash.bashrc ]; then
+ . /etc/bash.bashrc
+ fi
+ else
+ if [ "`id -u`" -eq 0 ]; then
+ PS1='# '
+ else
+ PS1='$ '
+ fi
+ fi
+fi
+
+# The default umask is now handled by pam_umask.
+# See pam_umask(8) and /etc/login.defs.
+
+if [ -d /etc/profile.d ]; then
+ for i in /etc/profile.d/*.sh; do
+ if [ -r $i ]; then
+ . $i
+ fi
+ done
+ unset i
+fi
diff --git a/files/etc/profile.d/prompt.sh b/files/etc/profile.d/prompt.sh
new file mode 100644
index 0000000..85d7bff
--- /dev/null
+++ b/files/etc/profile.d/prompt.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Fancy bash prompt.
+# See http://www.debian-administration.org/article/Fancy_Bash_Prompts
+#
+
+function command_prompt() {
+ exit_status="$?"
+ # colors
+ COLOR_RED="\[\033[31m\]"
+ COLOR_GREEN="\[\033[32m\]"
+ COLOR_YELLOW="\[\033[33m\]"
+ COLOR_BLUE="\[\033[34m\]"
+ COLOR_MAGENTA="\[\033[35m\]"
+ COLOR_CYAN="\[\033[36m\]"
+
+ COLOR_RED_BOLD="\[\033[31;1m\]"
+ COLOR_GREEN_BOLD="\[\033[32;1m\]"
+ COLOR_YELLOW_BOLD="\[\033[33;1m\]"
+ COLOR_BLUE_BOLD="\[\033[34;1m\]"
+ COLOR_MAGENTA_BOLD="\[\033[35;1m\]"
+ COLOR_CYAN_BOLD="\[\033[36;1m\]"
+
+ COLOR_NONE="\[\033[0m\]"
+ BOLD="\[\033[1m\]"
+
+ if [ "$exit_status" == "0" ]; then
+ status_color="${COLOR_GREEN}"
+ else
+ status_color="${COLOR_RED_BOLD}"
+ fi
+
+ PS1="(${status_color}${exit_status}${COLOR_NONE}) [${COLOR_RED}\D{%Y%m%d %H:%M:%S}${COLOR_NONE}] ${COLOR_GREEN}\u@\h${COLOR_NONE}:${COLOR_CYAN}\w${COLOR_NONE} \\$ "
+ PS2="${BOLD}>${OFF} "
+}
+
+PROMPT_COMMAND="command_prompt"
diff --git a/files/etc/profile.lenny b/files/etc/profile.lenny
deleted file mode 100644
index 05b4e53..0000000
--- a/files/etc/profile.lenny
+++ /dev/null
@@ -1,25 +0,0 @@
-# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
-# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-
-if [ "`id -u`" -eq 0 ]; then
- PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-else
- PATH="/usr/local/bin:/usr/bin:/bin:/usr/games"
-fi
-
-if [ "$PS1" ]; then
- if [ "$BASH" ]; then
- PS1='\u@\h:\w\$ '
- . /usr/local/bin/prompt.sh
- else
- if [ "`id -u`" -eq 0 ]; then
- PS1='# '
- else
- PS1='$ '
- fi
- fi
-fi
-
-export PATH
-
-umask 022