changed "dev_profile" to "environment"

moveTools
Adam Veldhousen 2015-06-26 08:54:52 -05:00
parent 4a5f0ee5ed
commit b1ee323b3d
Signed by: adam
GPG Key ID: 6DB29003C6DD1E4B
2 changed files with 11 additions and 17 deletions

View File

@ -16,18 +16,16 @@ shopt -s histappend # Append to the history file, not over
export LESS='-iMR' # Case insensite search, verbose prompting and raw output export LESS='-iMR' # Case insensite search, verbose prompting and raw output
export PAGER=less # Used to display text / man files export PAGER=less # Used to display text / man files
# setup go paths # setup go paths
export GOPATH="$HOME/projects/go" export GOPATH="$HOME/projects/go"
export GOROOT="/usr/local/go" export GOROOT="/usr/local/go"
export ANSIBLE_HOSTS="~/.ansible/hosts" export ANSIBLE_HOSTS="~/.ansible/hosts"
export POWERLINE_CONFIG_COMMAND=~/Tools/modules/powerline/scripts/powerline-config
export LANG="en_US.UTF-8"
export BOOT2DOCKER=/usr/local/Cellar/boot2docker/1.6.0/bin export BOOT2DOCKER=/usr/local/Cellar/boot2docker/1.6.0/bin
export LANG="en_US.UTF-8"
export WINDOWS="FALSE" export WINDOWS="FALSE"
export GIT_EDITOR=vim export GIT_EDITOR=vim
export POWERLINE_CONFIG_COMMAND=~/Tools/modules/powerline/scripts/powerline-config
if [ -d "${HOME}/.bin" ] ; then if [ -d "${HOME}/.bin" ] ; then
PATH=${HOME}/.bin:${PATH} PATH=${HOME}/.bin:${PATH}
@ -41,16 +39,12 @@ if [ -d "/c/Windows" ]; then
GOPATH="/d/Projects/Programming/go" GOPATH="/d/Projects/Programming/go"
BOOT2DOCKER=/c/Program\ Files/Boot2Docker\ for\ Windows/ BOOT2DOCKER=/c/Program\ Files/Boot2Docker\ for\ Windows/
GIT_EDITOR=~/Tools/vim/gvim.exe GIT_EDITOR=~/Tools/vim/gvim.exe
export FORTUNE=fortune.exe
# if there is a C:/Projects folder on this box then I'm using my work computer, which runs in a VM and is setup differently if [ -f ~/.windows ]; then
if [ -d "/c/Projects" ]; then . ~/.windows
export WORK="TRUE"
. ~/.work_profile
fi fi
fi fi
export EDITOR=$GIT_EDITOR export EDITOR=$GIT_EDITOR
export VISUAL=$EDITOR export VISUAL=$EDITOR

View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
# source development settings # source environment settings
if [ -f ~/.dev_profile ]; then if [ -f ~/.environment ]; then
. ~/.dev_profile . ~/.environment
fi fi
# Load any extra aliases # Load any extra aliases
@ -30,9 +30,9 @@ if [ -f /etc/bash_completion ]; then
. /etc/bash_completion . /etc/bash_completion
fi fi
if [ -d ~/.nvm ]; then # for when you want to do custom junk
. ~/.nvm/nvm.sh if [ -d ~/.extensions ]; then
. ~/.extensions
fi fi
printmotd printmotd
b2dinit