diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2021-02-22 23:57:57 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2021-02-22 23:57:57 +1300 |
commit | 4af268ce5d0555328c92dc86917d101629908aba (patch) | |
tree | 367500cafe0b1fa632c49fc66b960417c2a4c580 | |
parent | Merge branch 'release/v10.26.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-4af268ce5d0555328c92dc86917d101629908aba.tar.gz dotfiles-4af268ce5d0555328c92dc86917d101629908aba.zip |
Merge branch 'release/v11.0.0'v11.0.0
* release/v11.0.0:
Suppress performative wokeness in new Git
Add profile.d stub for cargo (Rust) PATH set
Add profile.d stub for cabal (Haskell) PATH set
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | cabal/cabal.sh | 3 | ||||
-rw-r--r-- | cabal/profile.d/cabal.sh | 3 | ||||
-rw-r--r-- | cargo/profile.d/cabal.sh | 3 | ||||
-rw-r--r-- | git/config.mi5 | 1 |
6 files changed, 20 insertions, 2 deletions
@@ -9,6 +9,8 @@ install-bash-completion \ install-bin \ install-bin-man \ + install-cabal \ + install-cargo \ install-cpanm \ install-curl \ install-dillo \ @@ -392,6 +394,12 @@ install-bin-man: cp -p -- man/man1/*.1df $(XDG_DATA_HOME)/man/man1 cp -p -- man/man8/*.8df $(XDG_DATA_HOME)/man/man8 +install-cabal: + cp -p -- cabal/profile.d/*.sh $(HOME)/.profile.d + +install-cargo: + cp -p -- cargo/profile.d/*.sh $(HOME)/.profile.d + install-cpanm: cp -p -- cpanm/profile.d/*.sh $(HOME)/.profile.d @@ -1,2 +1,2 @@ -tejr dotfiles v10.26.0 -Fri, 12 Feb 2021 12:59:48 +0000 +tejr dotfiles v11.0.0 +Mon, 22 Feb 2021 10:57:53 +0000 diff --git a/cabal/cabal.sh b/cabal/cabal.sh new file mode 100644 index 00000000..b5730916 --- /dev/null +++ b/cabal/cabal.sh @@ -0,0 +1,3 @@ +# Include user-built Haskell programs if the dir exists +[ -d "$HOME"/.cabal/bin ] || return +PATH=$HOME/.cabal/bin:$PATH diff --git a/cabal/profile.d/cabal.sh b/cabal/profile.d/cabal.sh new file mode 100644 index 00000000..b5730916 --- /dev/null +++ b/cabal/profile.d/cabal.sh @@ -0,0 +1,3 @@ +# Include user-built Haskell programs if the dir exists +[ -d "$HOME"/.cabal/bin ] || return +PATH=$HOME/.cabal/bin:$PATH diff --git a/cargo/profile.d/cabal.sh b/cargo/profile.d/cabal.sh new file mode 100644 index 00000000..b5730916 --- /dev/null +++ b/cargo/profile.d/cabal.sh @@ -0,0 +1,3 @@ +# Include user-built Haskell programs if the dir exists +[ -d "$HOME"/.cabal/bin ] || return +PATH=$HOME/.cabal/bin:$PATH diff --git a/git/config.mi5 b/git/config.mi5 index 304be811..8456cc74 100644 --- a/git/config.mi5 +++ b/git/config.mi5 @@ -8,6 +8,7 @@ output = compact [init] + defaultBranch = master templateDir = <% XDG_CONFIG_HOME %>/git/template [log] |