From 479936321d42f05c255eadb3c95369a61fd6421f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Wed, 23 Dec 2020 13:16:32 +0100
Subject: [PATCH] move defaults to own file, update variable usage

---
 bashrc_add       | 16 +++-------------
 defaults.conf    | 10 +++++++++-
 myshell_git_sync |  4 ++--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 115016e..033a86a 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -45,15 +45,9 @@ if [[ $- = *i* ]] ; then
     [ -z "${GIT_COMMITTER_NAME+x}" ]    && export GIT_COMMITTER_NAME=$FULLNAME
     [ -z "${GIT_COMMITTER_EMAIL+x}" ]   && export GIT_COMMITTER_EMAIL=$USEREMAIL
 
-    [ -z "${MSC_GIT_TIMEOUT+x}" ]                           && export MSC_GIT_TIMEOUT=5s
+#    [ -z "${MSC_GIT_TIMEOUT+x}" ]                           && export MSC_GIT_TIMEOUT=5s
     [ -z "${MSC_GIT_CHECKOUT_TIMEOUT+x}" ]                  && export MSC_GIT_CHECKOUT_TIMEOUT=20s
     [ -z "${MSC_GIT_SYNC+x}" ]                              && export MSC_GIT_SYNC=true
-    [ -z "${MSC_GIT_REPO_UPDATE_DEFAULT+x}" ]               && export MSC_GIT_REPO_UPDATE_DEFAULT=true
-    [ -z "${MSC_GIT_REPO_UPDATE_INTERVALL+x}" ]             && export MSC_GIT_REPO_UPDATE_INTERVALL=48 #intervall in hours
-    [ -z "${MSC_GIT_SUBMODULES_UPDATE_DEFAULT+x}" ]         && export MSC_GIT_SUBMODULES_UPDATE_DEFAULT=true
-    [ -z "${MSC_GIT_SUBMODULES_UPDATE_INTERVALL+x}" ]       && export MSC_GIT_SUBMODULES_UPDATE_INTERVALL=168 #intervall in hours 168=1week
-    [ -z "${MSC_GIT_SUBMODULES_SERVER_DEFAULT+x}" ]         && export MSC_GIT_SUBMODULES_SERVER_DEFAULT="git://git.schuerz.at/github.com/"
-    [ -z "${MSC_GIT_CHECKOUTSCRIPT_OPTIONS_DEFAULT+x}" ]    && export MSC_GIT_CHECKOUTSCRIPT_OPTIONS_DEFAULT="-h"
     
     # hardcoded git
     export SGIT="git -C ${MSC_BASE}" 
@@ -68,11 +62,7 @@ if [[ $- = *i* ]] ; then
     # Logging
     [ -z "${MSC_LOGDIR+x}" ]                && export MSC_LOGDIR="${HOME}/logs"
     [ -z "${MSC_LOGFILE+x}" ]               && export MSC_LOGFILE="${MSC_LOGDIR}/myshellconfig.log"
-    [ -z "${MSC_LOGLEVEL_DEFAULT+x}" ]      && export MSC_LOGLEVEL_DEFAULT="INFO"
-    [ -z "${MSC_FILELOGLEVEL_DEFAULT+x}" ]  && export MSC_FILELOGLEVEL_DEFAULT="DEBUG"
     [ -z "${SCRIPT_LOG+x}" ]                && export SCRIPT_LOG="${MSC_LOGFILE}"
-    [ -z "${LOGLEVEL_DEFAULT+x}" ]          && export LOGLEVEL_DEFAULT="${MSC_LOGLEVEL_DEFAULT-INFO}"
-    [ -z "${FILELOGLEVEL_DEFAULT+x}" ]      && export FILELOGLEVEL_DEFAULT="${MSC_FILELOGLEVEL_DEFAULT-INFO}"
     # Create necessary directories for logging
     [ -n "${MSC_LOGDIR-x}" ]                && mkdir -p "$MSC_LOGDIR"
     # load logging functions
@@ -95,9 +85,9 @@ EOF
 
     ckrepo () {
         # check if remote repo is reachable
-        if [ $MSC_GIT_SYNC -a $(stat --printf %Y ${MSC_GIT_UPD_REPO_STATFILE}  2>/dev/null || echo 0 ) \
+        if [ ${MSC_GIT_SYNC-$MSC_GIT_REPO_UPDATE} -a $(stat --printf %Y ${MSC_GIT_UPD_REPO_STATFILE}  2>/dev/null || echo 0 ) \
                 -lt $(date --date="${MSC_GIT_REPO_UPDATE_INTERVALL-0} hours ago" "+%s") ]; then
-            if $( timeout --foreground "${MSC_GIT_TIMEOUT}"  $SGIT ls-remote >/dev/null  2>&1) ;then 
+            if $( timeout --foreground "${MSC_GIT_TIMEOUT-$MSC_GIT_TIMEOUT_DEFAULT}"  $SGIT ls-remote >/dev/null  2>&1) ;then 
                 return 0
             else 
                 return 1
diff --git a/defaults.conf b/defaults.conf
index 91d5cc7..3a4b258 100644
--- a/defaults.conf
+++ b/defaults.conf
@@ -1,8 +1,16 @@
+export MSC_GIT_REPO_UPDATE_DEFAULT=true
+export MSC_GIT_REPO_UPDATE_INTERVALL_DEFAULT=48 #intervall in hours
 export MSC_GIT_SUBMODULES_UPDATE_DEFAULT=true
-export MSC_GIT_SUBMODULES_UPDATE_INTERVALL=48 #intervall in hours
+export MSC_GIT_SUBMODULES_UPDATE_INTERVALL_DEFAULT=196 #intervall in hours
 export MSC_GIT_SUBMODULES_SERVER_DEFAULT="git://git.schuerz.at/github.com/"
 export MSC_GIT_CHECKOUTSCRIPT_OPTIONS_DEFAULT="-h"
+export MSC_GIT_TIMEOUT_DEFAULT=5s
+export MSC_GIT_CHECKOUT_TIMEOUT_DEFAULT=20s
 export MSC_LOGLEVEL_DEFAULT="INFO"
 export MSC_FILELOGLEVEL_DEFAULT="DEBUG"
 export LOGLEVEL_DEFAULT="${MSC_LOGLEVEL_DEFAULT-INFO}"
 export FILELOGLEVEL_DEFAULT="${MSC_FILELOGLEVEL_DEFAULT-INFO}"
+MSC_LOGLEVEL_DEFAULT="INFO"
+MSC_FILELOGLEVEL_DEFAULT="DEBUG"
+LOGLEVEL_DEFAULT="${MSC_LOGLEVEL_DEFAULT}"
+FILELOGLEVEL_DEFAULT="${MSC_FILELOGLEVEL_DEFAULT}"
diff --git a/myshell_git_sync b/myshell_git_sync
index 00bdbd4..2694e95 100644
--- a/myshell_git_sync
+++ b/myshell_git_sync
@@ -116,13 +116,13 @@ if ! $SSHS; then
             else
                 loginfo "Clone ${MSC_GIT_REMOTE} and configure git" >&2
 
-                if $( timeout --foreground "${MSC_GIT_CHECKOUT_TIMEOUT}" \
+                if $( timeout --foreground "${MSC_GIT_CHECKOUT_TIMEOUT-$MSC_GIT_CHECKOUT_TIMEOUT_DEFAULT}" \
                     git -C ${HOME} clone --recurse-submodules "${MSC_GIT_REMOTE}" "${MSC_BASE}" ); then
                     :
                 else
                     MSC_GIT_REMOTE="${MSC_GIT_REMOTE_PUBLIC_HTTP}${MSC_GIT_REPO_NAME}"
                     loginfo "Clone ${MSC_GIT_REMOTE} (http, because other protocol is not reachable) and configure git" >&2
-                    timeout --foreground "${MSC_GIT_CHECKOUT_TIMEOUT}" \
+                    timeout --foreground "${MSC_GIT_CHECKOUT_TIMEOUT-$MSC_GIT_CHECKOUT_TIMEOUT_DEFAULT}" \
                         git -C ${HOME} clone --recurse-submodules "${MSC_GIT_REMOTE}" "${MSC_BASE}" || return 1 2>/dev/null || exit 1
                 fi