From 04e2ff30d8add583bcea24c0f37ce9a368cd7a78 Mon Sep 17 00:00:00 2001 From: tastytea Date: Fri, 18 Mar 2022 22:18:06 +0100 Subject: [PATCH] Use noid_dotfiles key for dotfiles if it exists --- .config/zsh/.zaliases | 8 ++++---- bin/setup_dotfiles.sh | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/zsh/.zaliases b/.config/zsh/.zaliases index f322b76..86887ea 100644 --- a/.config/zsh/.zaliases +++ b/.config/zsh/.zaliases @@ -47,12 +47,12 @@ alias tmux_monitor="tmux source-file ~/.tmux/monitor.session" alias exifremove='exiftool -all=' -tmp_alias_command='git --git-dir=${HOME}/.dotfiles/ --work-tree=${HOME}' +_tmp_config_alias='git --git-dir=${HOME}/.dotfiles/ --work-tree=${HOME}' if [[ "${HOST}" != "ventiloplattform" && -f ~/.ssh/noid_dotfiles ]]; then - tmp_alias_command="GIT_SSH_COMMAND=\"ssh -i ~/.ssh/noid_dotfiles\" ${tmp_alias_command}" + _tmp_config_alias="GIT_SSH_COMMAND=\"ssh -i ~/.ssh/noid_dotfiles\" ${_tmp_config_alias}" fi -alias config="${tmp_alias_command}" -unset tmp_alias_config +alias config="${_tmp_config_alias}" +unset _tmp_config_alias alias please='sudo' alias 🥺='sudo' diff --git a/bin/setup_dotfiles.sh b/bin/setup_dotfiles.sh index 0d73dba..6edfa60 100755 --- a/bin/setup_dotfiles.sh +++ b/bin/setup_dotfiles.sh @@ -1,18 +1,18 @@ #!/bin/zsh -tmp_alias_command='git --git-dir=${HOME}/.dotfiles/ --work-tree=${HOME}' -if [[ -f ~/.ssh/id_dotfiles ]]; then - export GIT_SSH_COMMAND="ssh -i ~/.ssh/id_dotfiles" - tmp_alias_command="GIT_SSH_COMMAND=\"ssh -i ~/.ssh/id_dotfiles\" ${tmp_alias_command}" +_tmp_config_alias='git --git-dir=${HOME}/.dotfiles/ --work-tree=${HOME}' +if [[ -f ~/.ssh/noid_dotfiles ]]; then + export GIT_SSH_COMMAND="ssh -i ~/.ssh/noid_dotfiles" + _tmp_config_alias="GIT_SSH_COMMAND=\"ssh -i ~/.ssh/noid_dotfiles\" ${_tmp_config_alias}" fi -alias config="${tmp_alias_command}" +alias config="${_tmp_config_alias}" git clone --bare git@schlomp.space:tastytea/dotfiles.git "${HOME}/.dotfiles" && \ config submodule init && \ config submodule update && \ config config --local status.showUntrackedFiles no && \ config config --local submodule.recurse true && \ - echo -e "Run \033[1;32mrm ${0} && ${tmp_alias_command} checkout\033[0m to copy the files to your home directory." + echo -e "Run \033[1;32mrm ${0} && ${_tmp_config_alias} checkout\033[0m to copy the files to your home directory." unset tmp_alias_config # TODO: [remote "origin"] needs to have