aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-09-26 16:09:55 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-09-26 16:09:55 -0300
commit4ab69f28fb6cb115d092b0109f9fcd1f0a05d5e8 (patch)
tree0d9b51c9ccb1125eda0c63542cd08707848d36ef
parentab40c427c08395d9380652405fd41e3dfab2d188 (diff)
parent06b3b37cea0f2b5edb74bb398b9e9630cbc4e2e4 (diff)
downloadshellprompt-4ab69f28fb6cb115d092b0109f9fcd1f0a05d5e8.tar.gz
shellprompt-4ab69f28fb6cb115d092b0109f9fcd1f0a05d5e8.tar.bz2
Merge branch 'master' of git.fluxo.info:shellprompt
-rw-r--r--files/bash.bashrc55
-rw-r--r--manifests/init.pp10
2 files changed, 0 insertions, 65 deletions
diff --git a/files/bash.bashrc b/files/bash.bashrc
deleted file mode 100644
index 54687b1..0000000
--- a/files/bash.bashrc
+++ /dev/null
@@ -1,55 +0,0 @@
-# System-wide .bashrc file for interactive bash(1) shells.
-
-# To enable the settings / commands in this file for login shells as well,
-# this file has to be sourced in /etc/profile.
-
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# 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, overwrite the one in /etc/profile)
-PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-
-# Commented out, don't overwrite xterm -T "title" -n "icontitle" by default.
-# If this is an xterm set the title to user@host:dir
-#case "$TERM" in
-#xterm*|rxvt*)
-# PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
-# ;;
-#*)
-# ;;
-#esac
-
-# enable bash completion in interactive shells
-#if ! shopt -oq posix; then
-# if [ -f /usr/share/bash-completion/bash_completion ]; then
-# . /usr/share/bash-completion/bash_completion
-# elif [ -f /etc/bash_completion ]; then
-# . /etc/bash_completion
-# fi
-#fi
-
-# if the command-not-found package is installed, use it
-if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then
- function command_not_found_handle {
- # check because c-n-f could've been removed in the meantime
- if [ -x /usr/lib/command-not-found ]; then
- /usr/lib/command-not-found -- "$1"
- return $?
- elif [ -x /usr/share/command-not-found/command-not-found ]; then
- /usr/share/command-not-found/command-not-found -- "$1"
- return $?
- else
- printf "%s: command not found\n" "$1" >&2
- return 127
- fi
- }
-fi
diff --git a/manifests/init.pp b/manifests/init.pp
index e6f0407..db83603 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,14 +6,4 @@ class shellprompt {
mode => 0644,
ensure => present,
}
-
- # TODO: remove this block in the future, as we're applying back jessie's version
- file { "/etc/bash.bashrc":
- source => "puppet:///modules/shellprompt/bash.bashrc",
- owner => "root",
- group => "root",
- mode => 0644,
- ensure => present,
- require => File['/etc/profile.d/prompt.sh'],
- }
}