Commit 9786e658 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

moved ~/.bash to ~/.shell; it can be used with zsh

parent 884df3e5

.bash_profile

+2 −2
Original line number Diff line number Diff line 
# .bash_profile



. ~/.bash/funcs

. ~/.shell/funcs



export BASH_PROFILE_LOADED=1
@@ -19,7 +19,7 @@ if [ -n "$PS1" ]; then 
	unset CKSUM PROMPTCOLOUR

fi



source_each ~/.bash/$(get_platform)/profile ~/.bash_local

source_each ~/.shell/$(get_platform)/profile ~/.bash_local



# Automatically run terminal multiplexer on SSH connect

[ -n "$SSH_TTY" ] && [ "x$TERM" != xscreen ] && has tmux && exec tmux -u attach

.bashrc

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ if ! [ -v BASH_PROFILE_LOADED ]; then 
	return # bash_profile sources this file

fi



. ~/.bash/funcs

. ~/.shell/funcs



# Source global definitions

# (debian global bashrc has a bad habit of setting PS1, so store and revert
@@ -19,7 +19,7 @@ source_first /etc/bash.bashrc /etc/bashrc 
PS1="$_PS1"

unset _PS1 grc



source_each ~/.bash/aliases ~/.bash/$(get_platform)/aliases ~/.bash_aliases

source_each ~/.shell/aliases ~/.shell/$(get_platform)/aliases ~/.bash_aliases



# Bash completion

ofs="$IFS"

.bash/aliases→.shell/aliases

+1 −1
Original line number Diff line number Diff line 
## General aliases

## ===============

#

# Some of these may be overridden in .bash/$PLATFORM/aliases

# Some of these may be overridden in ~/.shell/$PLATFORM/aliases

#



alias df='df -h'

.bash/funcs→.shell/funcs

+0 −1
Original line number Diff line number Diff line 
#!/bin/bash

# .bash_funcs



source_first()

{

.bash/gnu/aliases→.shell/gnu/aliases

+0 −0

File moved.

View file