aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Cabergs <charles.cabergs@colruytgroup.com>2021-11-22 14:56:26 +0100
committerCharles Cabergs <charles.cabergs@colruytgroup.com>2021-11-22 14:56:26 +0100
commite0f109b24283a442bf5d15a6ce2339589b84de1e (patch)
tree30aa3dd63c2cd90451739e017bc5137321fda646
parent01e485ad66e8fd31bf4c18381b4ba12d8e90db38 (diff)
downloaddotfiles-e0f109b24283a442bf5d15a6ce2339589b84de1e.tar.gz
dotfiles-e0f109b24283a442bf5d15a6ce2339589b84de1e.tar.bz2
dotfiles-e0f109b24283a442bf5d15a6ce2339589b84de1e.zip
Added darwin git config
-rw-r--r--config/git/config.darwin13
-rw-r--r--config/git/config.linux (renamed from config/git/config)0
-rwxr-xr-xinstall4
3 files changed, 15 insertions, 2 deletions
diff --git a/config/git/config.darwin b/config/git/config.darwin
new file mode 100644
index 0000000..87edb8b
--- /dev/null
+++ b/config/git/config.darwin
@@ -0,0 +1,13 @@
+[user]
+ name = Charles Cabergs
+ email = charles.cabergs@colruytgroup.com
+[log]
+ decorate = full
+[pull]
+ rebase = false
+[merge]
+ tool = vimdiff
+[commit]
+ gpgsign = false
+[init]
+ defaultBranch = master
diff --git a/config/git/config b/config/git/config.linux
index 0dbbd8f..0dbbd8f 100644
--- a/config/git/config
+++ b/config/git/config.linux
diff --git a/install b/install
index fa0c195..653867b 100755
--- a/install
+++ b/install
@@ -45,8 +45,8 @@ link_home_files() {
# generate a file with the file path in this repo and the link for the real path
# each line is in the format: TARGET LINKNAME
find "$rice_dir" -type f |
- sed "/\.$other_platform\./ d" |
- sed -e 'p' -e "s:^$rice_dir:$dest_dir:" -e "s/\.$platform\././" |
+ sed "/\.$other_platform/ d" |
+ sed -e 'p' -e "s:^$rice_dir:$dest_dir:" -e "s/\.$platform//" |
awk '{ if (NR % 2 == 1) { print "'"$(pwd)"'" "/" $0 } else print }' |
xargs -L 2 > "$paths"
< "$paths" cut -d ' ' -f 2 | xargs -L 1 dirname | xargs -L 1 mkdir -pv