Merge branch 'master' of ssh://git.trj.tw:10022/jay/dotfiles

This commit is contained in:
jay 2023-04-09 16:53:52 +08:00
commit 099d617895
2 changed files with 4 additions and 1 deletions

View File

@ -26,9 +26,11 @@
{{- $installNode := promptBoolOnce . "installNode" "install nodejs bin" true -}}
{{- $installRust := promptBoolOnce . "installRust" "install rust bin" true -}}
{{- $enableTmux := promptBoolOnce . "enableTmux" "install enable tmux autostart" true -}}
{{- $enableSSHAgent := promptBoolOnce . "enableSSHAgent" "install enable ssh agent autostart" true -}}
[data.shell]
tmux = {{ $enableTmux }}
ssh_agent = {{ $enableSSHAgent }}
[data.gitconfig]
email = {{ $email | quote }}

View File

@ -10,8 +10,8 @@ function start_agent {
/usr/bin/ssh-add;
}
{{ if .shell.ssh_agent }}
# Source SSH settings, if applicable
if [ -f "${SSH_ENV}" ]; then
. "${SSH_ENV}" > /dev/null
#ps ${SSH_AGENT_PID} doesn't work under cywgin
@ -21,6 +21,7 @@ if [ -f "${SSH_ENV}" ]; then
else
start_agent;
fi
{{ end }}
function envf {
if [ ! -f "$1" ]; then