1
0
Fork 0
mirror of https://github.com/MillironX/dotfiles.git synced 2024-11-21 13:16:04 +00:00

feat: Replace shell execution with shell variable

This commit is contained in:
Thomas A. Christensen II 2023-10-06 10:47:04 -05:00
parent 63d5bfcd6f
commit 791f4ae7b7
Signed by: millironx
GPG key ID: 09335146883990B9
3 changed files with 7 additions and 4 deletions

View file

@ -1,6 +1,7 @@
# shellcheck shell=sh
# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
__conda_setup="$($HOME/miniconda3/bin/conda shell.$(basename $(readlink -f /proc/$$/exe)) 'hook' 2> /dev/null)"
__conda_setup="$($HOME/miniconda3/bin/conda shell.$SH 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
@ -18,7 +19,7 @@ fi
# <<< conda initialize <<<
{{- if lookPath "direnv" }}
eval "$(direnv hook $(basename $(readlink -f /proc/$$/exe)))"
eval "$(direnv hook $SH)"
{{- end }}
if [ -f $HOME/.ion/bin/ion ]; then
@ -27,8 +28,8 @@ if [ -f $HOME/.ion/bin/ion ]; then
fi
# Import GNU parallel
if [ $(command -v env_parallel.$(basename $(readlink -f /proc/$$/exe))) ]; then
source $(which env_parallel.$(basename $(readlink -f /proc/$$/exe)))
if [ $(command -v env_parallel.$SH) ]; then
source $(which env_parallel.$SH)
fi
{{- if eq .machinetype "workstation" }}

View file

@ -1,5 +1,6 @@
# shellcheck shell=bash
# .bashrc
export SH=bash
if [ -f "$HOME/.modules" ]; then
source $HOME/.modules

View file

@ -1,3 +1,4 @@
export SH=zsh
{{- if eq .chezmoi.os "linux" }}
{{- if or
(eq .machinetype "workstation")