From e0f109b24283a442bf5d15a6ce2339589b84de1e Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Mon, 22 Nov 2021 14:56:26 +0100 Subject: Added darwin git config --- config/git/config | 14 -------------- config/git/config.darwin | 13 +++++++++++++ config/git/config.linux | 14 ++++++++++++++ install | 4 ++-- 4 files changed, 29 insertions(+), 16 deletions(-) delete mode 100644 config/git/config create mode 100644 config/git/config.darwin create mode 100644 config/git/config.linux diff --git a/config/git/config b/config/git/config deleted file mode 100644 index 0dbbd8f..0000000 --- a/config/git/config +++ /dev/null @@ -1,14 +0,0 @@ -[user] - name = Charles Cabergs - email = me@cacharle.xyz - signingkey = me@cacharle.xyz -[log] - decorate = full -[pull] - rebase = false -[merge] - tool = vimdiff -[commit] - gpgsign = true -[init] - defaultBranch = master 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.linux b/config/git/config.linux new file mode 100644 index 0000000..0dbbd8f --- /dev/null +++ b/config/git/config.linux @@ -0,0 +1,14 @@ +[user] + name = Charles Cabergs + email = me@cacharle.xyz + signingkey = me@cacharle.xyz +[log] + decorate = full +[pull] + rebase = false +[merge] + tool = vimdiff +[commit] + gpgsign = true +[init] + defaultBranch = master 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 -- cgit