Skip to content

Commit

Permalink
fix(editors): install sublime-text3 instead of sublime-text2
Browse files Browse the repository at this point in the history
do not set the core editor for git
set the default editor to atom in bashrc
  • Loading branch information
Deavon M. McCaffery committed Aug 19, 2016
1 parent e15dabc commit 6b560ba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions install
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ if [ "$(uname)" == "Darwin" ]; then

git config --system credential.helper osxkeychain

for app in atom visual-studio-code sublime-text textmate; do
echo "Tapping extended versions for caskroom..."
brew tap caskroom/versions 1>/dev/null 2>&1

for app in atom visual-studio-code sublime-text3 textmate; do
if brew cask list -1 | grep -q "^${app}\$"; then
echo "Upgrading $app..."
brew cask update ${app}
Expand All @@ -72,12 +75,8 @@ if [ "$(uname)" == "Darwin" ]; then
brew cask install ${app}
fi
done

git config --system core.editor "atom --wait"
fi

git config --system color.ui true

gitpromptname=git-prompt.sh
gitprompt=$LOCAL_PREFIX/etc/bash_completion.d/$gitpromptname
gitprompturi=https://raw.githubusercontent.com/lyze/posh-git-sh/master/$gitpromptname
Expand Down
2 changes: 1 addition & 1 deletion src/bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export CLICOLOR=1
export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"

# other system settings
export EDITOR='nano'
export EDITOR='atom --wait'
export HISTCONTROL=ignoredubs

if type brew 1>/dev/null 2>&1; then
Expand Down

0 comments on commit 6b560ba

Please sign in to comment.