Skip to content

Commit

Permalink
fix(zsh): Change project directory environment variable
Browse files Browse the repository at this point in the history
Using `$ZSH` for the project root directory conflicts with zsh projects
and plugins (e.g., oh-my-zsh).  Change `$ZSH` -> `$DOTFILES`.

WIP: #8/b
  • Loading branch information
Derek Michael Frank committed Jul 17, 2016
1 parent d07fdf5 commit 028c14e
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions bin/dot
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
#
# `dot` handles installation, updates, things like that. Run it periodically
# to make sure you're on the latest and greatest.
export ZSH=$HOME/.dotfiles
export DOTFILES=$HOME/.dotfiles

# Set macOS defaults
$ZSH/macos/set-defaults.sh
$DOTFILES/macos/set-defaults.sh

# Install homebrew
$ZSH/homebrew/install.sh 2>&1
$DOTFILES/homebrew/install.sh 2>&1

# Upgrade homebrew
echo "› brew update"
brew update

# Install software
echo "$ZSH/script/install"
$ZSH/script/install
echo "$DOTFILES/script/install"
$DOTFILES/script/install
4 changes: 2 additions & 2 deletions bin/set-defaults
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
#
# Sets macOS defaults by running $ZSH/macos/set-defaults.sh.
# Sets macOS defaults by running $DOTFILES/macos/set-defaults.sh.

exec $ZSH/macos/set-defaults.sh
exec $DOTFILES/macos/set-defaults.sh
6 changes: 3 additions & 3 deletions git/gitconfig.symlink
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
protocol = https
[alias]
co = checkout
promote = !$ZSH/bin/git-promote
wtf = !$ZSH/bin/git-wtf
rank-contributors = !$ZSH/bin/git-rank-contributors
promote = !$DOTFILES/bin/git-promote
wtf = !$DOTFILES/bin/git-wtf
rank-contributors = !$DOTFILES/bin/git-rank-contributors
count = !git shortlog -sn
[color]
diff = auto
Expand Down
2 changes: 1 addition & 1 deletion system/_path.zsh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export PATH="./bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH"
export PATH="./bin:/usr/local/bin:/usr/local/sbin:$DOTFILES/bin:$PATH"
export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
4 changes: 2 additions & 2 deletions zsh/config.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ fi
export LSCOLORS="exfxcxdxbxegedabagacad"
export CLICOLOR=true

fpath=($ZSH/functions $fpath)
fpath=($DOTFILES/functions $fpath)

autoload -U $ZSH/functions/*(:t)
autoload -U $DOTFILES/functions/*(:t)

HISTFILE=~/.zsh_history
HISTSIZE=10000
Expand Down
2 changes: 1 addition & 1 deletion zsh/fpath.zsh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#add each topic folder to fpath so that they can add functions and completion scripts
for topic_folder ($ZSH/*) if [ -d $topic_folder ]; then fpath=($topic_folder $fpath); fi;
for topic_folder ($DOTFILES/*) if [ -d $topic_folder ]; then fpath=($topic_folder $fpath); fi;
6 changes: 3 additions & 3 deletions zsh/zshrc.symlink
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# shortcut to this dotfiles path is $ZSH
export ZSH=$HOME/.dotfiles
# shortcut to this dotfiles path is $DOTFILES
export DOTFILES=$HOME/.dotfiles

# your project folder that we can `c [tab]` to
export PROJECTS=~/Code
Expand All @@ -14,7 +14,7 @@ fi

# all of our zsh files
typeset -U config_files
config_files=($ZSH/**/*.zsh)
config_files=($DOTFILES/**/*.zsh)

# load the path files
for file in ${(M)config_files:#*/path.zsh}
Expand Down

0 comments on commit 028c14e

Please sign in to comment.