Skip to content

Commit

Permalink
move local directory to ~/Dropbox/dotfiles from ~/Dropbox/Mackup
Browse files Browse the repository at this point in the history
  • Loading branch information
LucasLarson committed Oct 25, 2020
1 parent ef0d509 commit 29b9422
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .mackup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ path = Dropbox
# You can customize the directory name in which Mackup stores your file. By
# default, if not specified, Mackup creates a "Mackup" directory in the storage
# engine you chose, e.g. "~/Dropbox/Mackup".
directory = Mackup
directory = dotfiles

# List of applications you want to explicitly sync
# One application name per line
Expand Down
4 changes: 2 additions & 2 deletions .oh-my-zsh/custom/aliases.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ alias apm="apm-nightly"

# dotfiles
# https://stackoverflow.com/q/4210042#comment38334264_4210072
alias mu="cd ${DOTFILES:-$HOME/Dropbox/Mackup} && find . -type f -name '.DS_Store' -delete && find . -type d -empty -not -path './.git/*' -delete && mackup backup --force --root && git fetch --all --verbose && git submodule update --init --recursive && git status"
alias mux="cd ${DOTFILES:-$HOME/Dropbox/Mackup} && find . -type f -name '.DS_Store' -print -delete && find . -type d -empty -not -path './.git/*' -print -delete && mackup backup --force --root --verbose && git fetch --all --verbose && git submodule update --init --recursive --remote && git status --verbose"
alias mu="cd ${DOTFILES:-$HOME/Dropbox/dotfiles} && find . -type f -name '.DS_Store' -delete && find . -type d -empty -not -path './.git/*' -delete && mackup backup --force --root && git fetch --all --verbose && git submodule update --init --recursive && git status"
alias mux="cd ${DOTFILES:-$HOME/Dropbox/dotfiles} && find . -type f -name '.DS_Store' -print -delete && find . -type d -empty -not -path './.git/*' -print -delete && mackup backup --force --root --verbose && git fetch --all --verbose && git submodule update --init --recursive --remote && git status --verbose"


# Git
Expand Down
4 changes: 2 additions & 2 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ fi
# https://github.com/ohmyzsh/ohmyzsh/blob/5ffc0d036c587741fd25092e7809dad2b00b3677/oh-my-zsh.sh#L20-L24
# https://gnu.org/software/bash/manual/bash#Bash-Conditional-Expressions
# https://stackoverflow.com/a/13408590
if [ -z "$DOTFILES" ] || [ -e "$HOME/Dropbox/Mackup" ]; then
export DOTFILES="$HOME/Dropbox/Mackup"
if [ -z "$DOTFILES" ] || [ -e "$HOME/Dropbox/dotfiles" ]; then
export DOTFILES="$HOME/Dropbox/dotfiles"
else
export DOTFILES="$HOME"
fi
Expand Down

0 comments on commit 29b9422

Please sign in to comment.