diff --git a/bashrc_add b/bashrc_add index 361ee24..30f262f 100755 --- a/bashrc_add +++ b/bashrc_add @@ -24,13 +24,14 @@ if [[ $- = *i* ]] ; then [ -z "${MSC_SUBPATH+x}" ] && export MSC_SUBPATH=".local/myshellconfig" [ -z "${MSC_BASE+x}" ] && export MSC_BASE="${HOME}/${MSC_SUBPATH}" - # DEFAULTS - [ -e ${MSC_BASE}/defaults.conf ] && . ${MSC_BASE}/defaults.conf - # hardcoded paths export MSC_BASE_PARENT="$(dirname $MSC_BASE)" export MSC_BASH_COMPLETION="${HOME}/${MSC_SUBPATH}/bash_completion.d" + # Load DEFAULTS + [ -e ${MSC_BASE}/defaults.conf ] && . ${MSC_BASE}/defaults.conf + + # Userdata [ -z "${USERNAME+x}" ] && export USERNAME="$USER" [ -z "${USEREMAIL+x}" ] && export USEREMAIL="$USER@$(domainname -d)" diff --git a/defaults.conf b/defaults.conf index 222f807..91d5cc7 100644 --- a/defaults.conf +++ b/defaults.conf @@ -1,4 +1,8 @@ -MSC_GIT_SUBMODULES_UPDATE_DEFAULT=true -MSC_GIT_SUBMODULES_UPDATE_INTERVALL=48 #intervall in hours -MSC_GIT_SUBMODULES_SERVER_DEFAULT="git://git.schuerz.at/github.com/" -MSC_GIT_CHECKOUTSCRIPT_OPTIONS_DEFAULT="-h" +export MSC_GIT_SUBMODULES_UPDATE_DEFAULT=true +export MSC_GIT_SUBMODULES_UPDATE_INTERVALL=48 #intervall in hours +export MSC_GIT_SUBMODULES_SERVER_DEFAULT="git://git.schuerz.at/github.com/" +export MSC_GIT_CHECKOUTSCRIPT_OPTIONS_DEFAULT="-h" +export MSC_LOGLEVEL_DEFAULT="INFO" +export MSC_FILELOGLEVEL_DEFAULT="DEBUG" +export LOGLEVEL_DEFAULT="${MSC_LOGLEVEL_DEFAULT-INFO}" +export FILELOGLEVEL_DEFAULT="${MSC_FILELOGLEVEL_DEFAULT-INFO}"