From d4c71386678b92608ced5b4ac8da5f858a07b97f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 22 Jan 2020 12:33:14 +0100 Subject: [PATCH] cleanup WDOTD --- myshell_load_defaults | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/myshell_load_defaults b/myshell_load_defaults index 7480fb2..3d0185f 100644 --- a/myshell_load_defaults +++ b/myshell_load_defaults @@ -95,15 +95,25 @@ 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") + ARCHIVSUBPATH="archive/work" + ARCHIVPATH="${HOME}/${ARCHIVSUBPATH}" + WDOTD=$(date "+${ARCHIVPATH}/%Y/%m/work_%Y%m%d") + WORKDIR="${HOME}/Work" [ -e $WDOTD ] || mkdir -pv "${WDOTD}" >>${MYSHELLCONFIG_LOGFILE} - if [[ ( -e "${HOME}/Work" && -h "${HOME}/Work" ) || ! -e "${HOME}/Work" ]] ; then - ln -svnf "${WDOTD}" "${HOME}/Work" >>${MYSHELLCONFIG_LOGFILE} - alias gowork='cd "${HOME}/Work"' + if [[ ( -e "${WORKDIR}" && -h "${WORKDIR}" ) || ! -e "${WORKDIR}" ]] ; then + ln -svnf "${WDOTD}" "${WORKDIR}" >>${MYSHELLCONFIG_LOGFILE} + alias gowork='cd "${WORKDIR}"' else - echo "${HOME}/Work exists and is real directory" |tee -a ${MYSHELLCONFIG_LOGFILE} 2>&1 - alias gowork='echo "~/Work is not confiugurable, see ${MYSHELLCONFIG_LOGFILE}' + echo "${WORKDIR} exists and is real directory" |tee -a ${MYSHELLCONFIG_LOGFILE} 2>&1 + alias gowork='echo "${WORKDIR} is not configurable, see ${MYSHELLCONFIG_LOGFILE}' fi + + for i in $(find ${ARCHIVPATH} -type d); do + if [ ! "$(ls -A $i)" ]; then + echo "DIR $i is empty -> remove it" + echo rm -rf "$i" + fi + done fi