From b68e1c9c7da4d6fb72d8021ae3c43c4c5c8d3a15 Mon Sep 17 00:00:00 2001 From: Jack-Benny Persson Date: Wed, 8 Jan 2014 06:22:25 +0100 Subject: [PATCH] Added Makefile and rc-files --- Makefile | 15 ++++ bashfiles/.bashrc | 177 +++++++++++++++++++++++++++++++++++++++++++++ bashfiles/.profile | 19 +++++ cshfiles/.cshrc | 1 + dashfiles/.profile | 5 ++ shellchooser.sh | 28 +++++-- 6 files changed, 238 insertions(+), 7 deletions(-) create mode 100644 Makefile create mode 100644 bashfiles/.bashrc create mode 100644 bashfiles/.profile create mode 100644 cshfiles/.cshrc create mode 100644 dashfiles/.profile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8f01ee3 --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ +FILES=shellchooser.sh bashfiles/.profile bashfiles/.bashrc cshfiles/.cshrc \ +dashfiles/.profile + +install: $(FILES) + chmod 755 shellchooser.sh + cp shellchooser.sh /bin/shellchooser.sh + cp -r bashfiles /etc/bashfiles + cp -r cshfiles /etc/cshfiles + cp -r dashfiles /etc/dashfiles + +uninstall: + rm /bin/shellchooser.sh + rm -rf /etc/bashfiles + rm -rf /etc/cshfiles + rm -rf /etc/dashfiles diff --git a/bashfiles/.bashrc b/bashfiles/.bashrc new file mode 100644 index 0000000..caf75c3 --- /dev/null +++ b/bashfiles/.bashrc @@ -0,0 +1,177 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# All the functions for git-status in PS1 +# Found at this URL: +# http://stackoverflow.com/questions/4133904/ps1-line-with-git-current-branch-and-colors + +# Define the colors +YELLOW="\[\033[1;33m\]" +RED="\[\033[1;31m\]" +COLCLEAR="\[\033[0m\]" +GRAY="\[\033[1;30m\]" +LIGHT_GRAY="\[\033[0;37m\]" +CYAN="\[\033[0;36m\]" +LIGHT_CYAN="\[\033[1;36m\]" +BLUE="\[\033[01;34m\]" +GREEN="\[\033[1;32m\]" + +function we_are_in_git_work_tree +{ + git rev-parse --is-inside-work-tree &> /dev/null +} + +function parse_git_branch +{ + if we_are_in_git_work_tree + then + local BR=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD 2> /dev/null) + if [ "$BR" == HEAD ] + then + local NM=$(git name-rev --name-only HEAD 2> /dev/null) + if [ "$NM" != undefined ] + then echo -n "@$NM" + else git rev-parse --short HEAD 2> /dev/null + fi + else + echo -n $BR + fi + fi +} + +function parse_git_status +{ + if we_are_in_git_work_tree + then + local ST=$(git status --short 2> /dev/null) + if [ -n "$ST" ] + then echo -n " + " + else echo -n " - " + fi + fi +} + +function pwd_depth_limit_2 +{ + if [ "$PWD" = "$HOME" ] + then echo -n "~" + else pwd | sed -e "s|.*/\(.*/.*\)|\1|" + fi +} + + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# 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 + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# 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 + export -f parse_git_branch parse_git_status we_are_in_git_work_tree \ + pwd_depth_limit_2 + export PS1="${debian_chroot:+($debian_chroot)}${YELLOW}\u@\h${COLCLEAR}:${BLUE}\w${RED}\$(parse_git_status)${LIGHT_CYAN}\$(parse_git_branch)${COLCLEAR}\$ " + export TERM="xterm-color" +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 dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +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). +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 + diff --git a/bashfiles/.profile b/bashfiles/.profile new file mode 100644 index 0000000..4f9b055 --- /dev/null +++ b/bashfiles/.profile @@ -0,0 +1,19 @@ +# if running bash +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" +fi + +if [ -e /usr/share/terminfo/x/xterm-256color ]; then + export TERM='xterm-256color' +else + export TERM='xterm-color' +fi + diff --git a/cshfiles/.cshrc b/cshfiles/.cshrc new file mode 100644 index 0000000..22b2c21 --- /dev/null +++ b/cshfiles/.cshrc @@ -0,0 +1 @@ +set path=(/bin /usr/bin/X11 /usr/bin /usr/local /usr/local/bin) diff --git a/dashfiles/.profile b/dashfiles/.profile new file mode 100644 index 0000000..8be06a4 --- /dev/null +++ b/dashfiles/.profile @@ -0,0 +1,5 @@ +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" +fi + diff --git a/shellchooser.sh b/shellchooser.sh index d039735..2a2bc47 100755 --- a/shellchooser.sh +++ b/shellchooser.sh @@ -26,12 +26,15 @@ Author="Jack-Benny Persson (jack-benny@cyberinfo.se)" # Binaries Which="/usr/bin/which" + # Binaries entered in the list will be avalible to the script as variables with # the first letter uppercase Binaries=(clear cp printf cat mktemp rm tail dialog diff) # Variables -Skel="/etc/skel" +BashFiles="/etc/shellchooser/bash" +CshFiles="/etc/shellchooser/csh" + ### Functions ### @@ -57,7 +60,8 @@ print_help() EOT } -# Create our chooser dialog +# Create our chooser dialog and return 1 if user aborted the dialog (if the +# the user hits esc or cancel). Otherwise return 0. chooser() { Temp=`$Mktemp -t chooser.XXXX` @@ -70,22 +74,32 @@ chooser() Shell=`$Cat $Temp` } -# Check out environment variables +# Check out environment variables and if they have changed, replace +# them them with the original files check_env() { case $Shell in "/bin/bash") - $Diff ${HOME}/.profile ${Skel}/.profile &> /dev/null + $Diff ${HOME}/.profile ${BashFiles}/.profile &> /dev/null if [ $? -ne 0 ]; then - $Cp ${Skel}/.profile ${HOME} + $Cp ${BashFiles}/.profile ${HOME} fi - $Diff ${HOME}/.bashrc ${Skel}/.bashrc &> /dev/null + $Diff ${HOME}/.bashrc ${BashFiles}/.bashrc &> /dev/null if [ $? -ne 0 ]; then - $Cp ${Skel}/.bashrc ${HOME} + $Cp ${BashFiles}/.bashrc ${HOME} fi ;; "/bin/csh") + $Diff ${HOME}/.cshrc ${CshFiles}/.cshrc &> /dev/null + if [ $? -ne 0 ]; then + $Cp ${CshFiles}/.cshrc ${HOME} + fi ;; + "/bin/dash") + $Diff ${HOME}/.profile ${DashFiles}./profile + if [ $? -ne 0 ]; then + $Cp ${DashFiles}/.profile ${HOME} + fi esac }