Skip to content
Browse files

Remove useless/unused stuff around .bashrc files

- .bashrc of 'travis' user explicitly loaded /etc/profile
  definitions, but /etc/profile.d mechanism is applied by default in
  bash shell creation.
- .bashrc of 'root' user is managed with a template, not anymore with a
  cookbook file.
  • Loading branch information...
1 parent 8cdd195 commit b3e326eb2bdcfe411c2c54107ab1b3010338e00d @gildegoma gildegoma committed Feb 11, 2013
View
86 ci_environment/travis_build_environment/files/default/root/dot_bashrc.sh
@@ -1,86 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# set these as early as possible. MK.
-export LANG=en_US.UTF-8
-export LC_ALL=en_US.UTF-8
-
-
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
-# don't put duplicate lines in the history. See bash(1) for more options
-# ... or force ignoredups and ignorespace
-HISTCONTROL=ignoredups:ignorespace
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
- debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
- xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
- if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
- # We have color support; assume it's compliant with Ecma-48
- # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
- # a case would tend to support setf rather than setaf.)
- color_prompt=yes
- else
- color_prompt=
- fi
-fi
-
-if [ "$color_prompt" = yes ]; then
- PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
- PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
- PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
- ;;
-*)
- ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
- test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-
- alias ls='ls --color=auto'
- alias grep='grep --color=auto'
- alias fgrep='fgrep --color=auto'
- alias egrep='egrep --color=auto'
-fi
-
-export DEBIAN_FRONTEND=noninteractive
-
-export CI=true
-export TRAVIS=true
View
2 ci_environment/travis_build_environment/recipes/ci_user.rb
@@ -45,7 +45,7 @@
group node.travis_build_environment.group
mode 0755
- source "ci_user/dot_bashrc.sh"
+ source "ci_user/dot_bashrc.sh.erb"
end
View
4 ...t/templates/default/ci_user/dot_bashrc.sh → ...mplates/default/ci_user/dot_bashrc.sh.erb
@@ -99,10 +99,6 @@ fi
export JAVA_HOME=<%= node.java.java_home %>
-if [ -f /etc/profile ]; then
- . /etc/profile
-fi
-
# enable programmable completion features (you don't need to enable
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
# sources /etc/bash.bashrc).

0 comments on commit b3e326e

Please sign in to comment.
Something went wrong with that request. Please try again.