From ab12293bf80737a33e7e2f9f4ae0ba3968cba5b6 Mon Sep 17 00:00:00 2001 From: foo Date: Thu, 16 Jul 2020 13:39:39 +0200 Subject: [PATCH] export GIT_* variables --- bashrc_add | 14 +++++++------- functions.sh | 14 +++++++------- myshell_load_fortmpconfig | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/bashrc_add b/bashrc_add index a30640f..80e94ed 100755 --- a/bashrc_add +++ b/bashrc_add @@ -14,13 +14,13 @@ if [[ $- = *i* ]] ; then # default timeouts definted in myshellconfig_load_default #[ -z "${MYSHELLCONFIG_ROOT_TMOUT+x}" ] && MYSHELLCONFIG_ROOT_TMOUT=500 #[ -z "${MYSHELLCONFIG_USER_TMOUT+x}" ] && MYSHELLCONFIG_USER_TMOUT=0 - [ -z "${USERNAME+x}" ] && USERNAME="$USER" - [ -z "${USEREMAIL+x}" ] && USEREMAIL="$USER@$(domainname -d)" - [ -z "${FULLNAME+x}" ] && FULLNAME="$(getent passwd $USER | cut -d ":" -f 5 | cut -d ',' -f 1)" - [ -z "${GIT_AUTHOR_NAME+x}" ] && GIT_AUTHOR_NAME=$FULLNAME - [ -z "${GIT_AUTHOR_EMAIL+x}" ] && GIT_AUTHOR_EMAIL=$USEREMAIL - [ -z "${GIT_COMMITTER_NAME+x}" ] && GIT_COMMITTER_NAME=$FULLNAME - [ -z "${GIT_COMMITTER_EMAIL+x}" ] && GIT_COMMITTER_EMAIL=$USEREMAIL + [ -z "${USERNAME+x}" ] && export USERNAME="$USER" + [ -z "${USEREMAIL+x}" ] && export USEREMAIL="$USER@$(domainname -d)" + [ -z "${FULLNAME+x}" ] && export FULLNAME="$(getent passwd $USER | cut -d ":" -f 5 | cut -d ',' -f 1)" + [ -z "${GIT_AUTHOR_NAME+x}" ] && export GIT_AUTHOR_NAME=$FULLNAME + [ -z "${GIT_AUTHOR_EMAIL+x}" ] && export GIT_AUTHOR_EMAIL=$USEREMAIL + [ -z "${GIT_COMMITTER_NAME+x}" ] && export GIT_COMMITTER_NAME=$FULLNAME + [ -z "${GIT_COMMITTER_EMAIL+x}" ] && export GIT_COMMITTER_EMAIL=$USEREMAIL [ -z "${MYSHELLCONFIG_SUBPATH+x}" ] && MYSHELLCONFIG_SUBPATH=".local/myshellconfig" [ -z "${MYSHELLCONFIG_BASE+x}" ] && MYSHELLCONFIG_BASE="${HOME}/${MYSHELLCONFIG_SUBPATH}" diff --git a/functions.sh b/functions.sh index f6422b8..fdbc19e 100755 --- a/functions.sh +++ b/functions.sh @@ -14,13 +14,13 @@ sudo() { local SUDO SUDO=$( if [ -e /bin/sudo ]; then echo /bin/sudo; else echo /usr/bin/sudo; fi ) $SUDO \ - GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \ - GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \ - GIT_COMMITTER_EMAIL="$GIT_COMMITTER_EMAIL" \ - GIT_COMMITTER_NAME="$GIT_COMMITTER_NAME" \ - TMUX="$TMUX" \ - SSHS="$SSHS" \ - SSH_TTY="$SSH_TTY" \ + export GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \ + export GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \ + export GIT_COMMITTER_EMAIL="$GIT_COMMITTER_EMAIL" \ + export GIT_COMMITTER_NAME="$GIT_COMMITTER_NAME" \ + export TMUX="$TMUX" \ + export SSHS="$SSHS" \ + export SSH_TTY="$SSH_TTY" \ "$@" } diff --git a/myshell_load_fortmpconfig b/myshell_load_fortmpconfig index a726f30..dcfd108 100644 --- a/myshell_load_fortmpconfig +++ b/myshell_load_fortmpconfig @@ -12,12 +12,12 @@ fi export WORK=~/Work -[ -z "${USERNAME+x}" ] && USERNAME="$USER" -[ -z "${USEREMAIL+x}" ] && USEREMAIL="$USER@$(domainname -d)" -[ -z "${FULLNAME+x}" ] && FULLNAME="$(getent passwd $USER | cut -d ":" -f 5 | cut -d ',' -f 1)" -[ -z "${GIT_AUTHOR_NAME+x}" ] && GIT_AUTHOR_NAME=$FULLNAME -[ -z "${GIT_AUTHOR_EMAIL+x}" ] && GIT_AUTHOR_EMAIL=$USEREMAIL -[ -z "${GIT_COMMITTER_NAME+x}" ] && GIT_COMMITTER_NAME=$FULLNAME -[ -z "${GIT_COMMITTER_EMAIL+x}" ] && GIT_COMMITTER_EMAIL=$USEREMAIL +[ -z "${USERNAME+x}" ] && export USERNAME="$USER" +[ -z "${USEREMAIL+x}" ] && export USEREMAIL="$USER@$(domainname -d)" +[ -z "${FULLNAME+x}" ] && export FULLNAME="$(getent passwd $USER | cut -d ":" -f 5 | cut -d ',' -f 1)" +[ -z "${GIT_AUTHOR_NAME+x}" ] && export GIT_AUTHOR_NAME=$FULLNAME +[ -z "${GIT_AUTHOR_EMAIL+x}" ] && export GIT_AUTHOR_EMAIL=$USEREMAIL +[ -z "${GIT_COMMITTER_NAME+x}" ] && export GIT_COMMITTER_NAME=$FULLNAME +[ -z "${GIT_COMMITTER_EMAIL+x}" ] && export GIT_COMMITTER_EMAIL=$USEREMAIL turnoffbeep