jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

improve output

Browse source
This commit is contained in:
Jakobus Schürz 2020-01-22 10:10:10 +01:00
parent 905a222293
commit 66d74eee9f
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bashrc_add
View file

@ -23,7 +23,7 @@ if [[ $- = *i* ]] ; then
[ -z "${MYSHELLCONFIG_BASE+x}" ] && MYSHELLCONFIG_BASE="${HOME}/${MYSHELLCONFIG_SUBPATH}"
MYSHELLCONFIG_BASE_PARENT="$(dirname $MYSHELLCONFIG_BASE)"
[ -z "${MYSHELLCONFIG_LOGDIR+x}" ] && MYSHELLCONFIG_LOGDIR="${MYSHELLCONFIG_BASE}/logs"
[ -z "${MYSHELLCONFIG_LOGFILE+x}" ] && MYSHELLCONFIG_LOGFILE="${MYSHELLCONFIG_LOGDIR}/git.log"
[ -z "${MYSHELLCONFIG_LOGFILE+x}" ] && MYSHELLCONFIG_LOGFILE="${MYSHELLCONFIG_LOGDIR}/myshellconfig.log"
[ -z "${MYSHELLCONFIG_GIT_TIMEOUT+x}" ] && MYSHELLCONFIG_GIT_TIMEOUT=5s
[ -z "${MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT+x}" ] && MYSHELLCONFIG_GIT_CHECKOUT_TIMEOUT=20s
MYSHELLCONFIG_BASH_COMPLETION="${HOME}/${MYSHELLCONFIG_SUBPATH}/bash_completion.d"

31
myshell_load_defaults
View file

@ -59,20 +59,6 @@ if ! $SSHS; then
# Go HOME
#cd ${HOME}
# Create and link Work-Dir of the Day
WDOTD=$(date "+${HOME}/archive/work/%Y/%m/work_%Y%m%d")
[ -e $WDOTD ] || mkdir -pv "${WDOTD}"
if [[ ( -e "${HOME}/WORK" && -h "${HOME}/WORK" ) || ! -e "${HOME}/WORK" ]] ; then
ln -svnf "${WDOTD}" "${HOME}/WORK"
else
echo "${HOME}/WORK exists and is real directory"
fi
echo "bashrc_add sourced" 1>&2
if test ! $TMUX && test $SSH_TTY && test $TERM != screen && test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
cat << EOF
@ -110,3 +96,20 @@ else
esac
fi
# Create and link Work-Dir of the Day
if [ $(id -u) -ne 0 ]; then
WDOTD=$(date "+${HOME}/archive/work/%Y/%m/work_%Y%m%d")
[ -e $WDOTD ] || mkdir -pv "${WDOTD}"
if [[ ( -e "${HOME}/WORK" && -h "${HOME}/WORK" ) || ! -e "${HOME}/WORK" ]] ; then
ln -svnf "${WDOTD}" "${HOME}/WORK" >${MYSHELLCONFIG_LOGFILE} 2>&1
else
echo "${HOME}/WORK exists and is real directory" >${MYSHELLCONFIG_LOGFILE} 2>&1
fi
fi
echo "bashrc_add sourced" 2>&1 |tee -a ${MYSHELLCONFIG_LOGFILE} >&2