chawley/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Makefile to config git user info

Browse Source
This commit is contained in:
Charles Hawley
2019-02-13 12:42:42 -05:00
parent ca11256b0e
commit bcc6912992
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitconfig
View File

@@ -17,10 +17,11 @@
uncommit = reset --mixed HEAD~ uncommit = reset --mixed HEAD~
amend = commit --amend amend = commit --amend
unmerged = diff --name-only --diff-filter=U unmerged = diff --name-only --diff-filter=U
alias = config --get-regexp ^alias\\.
[push] [push]
default = simple default = simple
[color] [color]
ui = true ui = true
[user] [user]
name = chawley (hannibal) name = chawley
email = chawley@planethawleywood.com email = chawley@planethawleywood.com

13
Makefile
View File

@@ -1,8 +1,10 @@
server: mkdirs softlinks HOST=$(shell hostname)
server: mkdirs softlinks gitconfig
@echo "Running firstrun and Linking softlinks (server)" @echo "Running firstrun and Linking softlinks (server)"
nonserver: mkdirs softlinks-non-server softlinks nonserver: mkdirs softlinks-non-server softlinks gitconfig
@echo "Running firstrun and Linking softlinks (server)" @echo "Running firstrun and Linking softlinks (non-server)"
softlinks: dependencies softlinks: dependencies
@@ -11,7 +13,6 @@ softlinks: dependencies
@test -L ${HOME}/.elinks || ln -s ${HOME}/dotfiles/.elinks ${HOME}/.elinks @test -L ${HOME}/.elinks || ln -s ${HOME}/dotfiles/.elinks ${HOME}/.elinks
@test -L ${HOME}/.irssi || ln -s ${HOME}/dotfiles/.irssi ${HOME}/.irssi @test -L ${HOME}/.irssi || ln -s ${HOME}/dotfiles/.irssi ${HOME}/.irssi
@test -L ${HOME}/.gitconfig || ln -s ${HOME}/dotfiles/.gitconfig ${HOME}/.gitconfig @test -L ${HOME}/.gitconfig || ln -s ${HOME}/dotfiles/.gitconfig ${HOME}/.gitconfig
@test -L ${HOME}/.gitconfig || ln -s ${HOME}/dotfiles/.gitconfig ${HOME}/.gitconfig
@test -L ${HOME}/.gitignore || ln -s ${HOME}/dotfiles/.gitignore ${HOME}/.gitignore @test -L ${HOME}/.gitignore || ln -s ${HOME}/dotfiles/.gitignore ${HOME}/.gitignore
@test -L ${HOME}/.tmux.conf || ln -s ${HOME}/dotfiles/.tmux.conf ${HOME}/.tmux.conf @test -L ${HOME}/.tmux.conf || ln -s ${HOME}/dotfiles/.tmux.conf ${HOME}/.tmux.conf
@@ -19,10 +20,9 @@ softlinks-non-server: dependencies-nonserver
@test -L ${HOME}/.abcde.conf || ln -s ${HOME}/dotfiles/.abcde.config ${HOME}/.abcde.conf @test -L ${HOME}/.abcde.conf || ln -s ${HOME}/dotfiles/.abcde.config ${HOME}/.abcde.conf
@test -L ${HOME}/.crawlrc || ln -s ${HOME}/dotfiles/.crawlrc ${HOME}/.crawlrc @test -L ${HOME}/.crawlrc || ln -s ${HOME}/dotfiles/.crawlrc ${HOME}/.crawlrc
@test -L ${HOME}/.dosbox || ln -s ${HOME}/dotfiles/.dosbox ${HOME}/.dosbox @test -L ${HOME}/.dosbox || ln -s ${HOME}/dotfiles/.dosbox ${HOME}/.dosbox
@test -L ${HOME}/.conkyrc || ln -s ${HOME}/dotfiles/.conkyrc ${HOME}/.conkyrc
gitconfig: dependencies softlinks gitconfig: dependencies softlinks
git config --global user.name "${USER} (${HOST})" git config --global user.name "${USER} ($(HOST))"
git config --global user.email chawley@planethawleywood.com git config --global user.email chawley@planethawleywood.com
dependencies: dependencies:
@@ -35,7 +35,6 @@ dependencies:
dependencies-non-server: dependencies dependencies-non-server: dependencies
sudo apt install abcde || sudo yum install abcde sudo apt install abcde || sudo yum install abcde
sudo apt install dosbox || sudo yum install dosbox sudo apt install dosbox || sudo yum install dosbox
sudo apt install conky || sudo yum install conky
mkdirs: mkdirs:
mkdir -p ${HOME}/bin mkdir -p ${HOME}/bin