add additional ignores for example, template, tmpl extensions
refactor shell environment to pick up relative host and network directories via default (common parent with base)master
parent
fdd2f05198
commit
d6dfa7753a
|
@ -2,6 +2,9 @@
|
||||||
# i.e. beginning with .
|
# i.e. beginning with .
|
||||||
# no ignores here may begin with .
|
# no ignores here may begin with .
|
||||||
*.off
|
*.off
|
||||||
|
*.example
|
||||||
|
*.tmpl
|
||||||
|
*.template
|
||||||
*.md
|
*.md
|
||||||
*TODO*
|
*TODO*
|
||||||
*.log
|
*.log
|
||||||
|
|
14
shell.env
14
shell.env
|
@ -60,7 +60,14 @@ export NETWORK_DOMAINS=(238.kebler.net 645.kebler.net 3115.kebler.net)
|
||||||
# network domain folder entry will be made for each domain set, first is home domain, others via vpn
|
# network domain folder entry will be made for each domain set, first is home domain, others via vpn
|
||||||
if [[ $NETWORK_DOMAINS ]]; then
|
if [[ $NETWORK_DOMAINS ]]; then
|
||||||
export NETWORK_HOME=${NETWORK_DOMAINS[0]}
|
export NETWORK_HOME=${NETWORK_DOMAINS[0]}
|
||||||
export BASH_SHELL_NETWORK=/opt/bash/shell/network
|
# TODO needs to be automatically set not hard coded
|
||||||
|
declare parent
|
||||||
|
parent=$(dirname $BASH_SHELL_BASE)
|
||||||
|
|
||||||
|
export BASH_SHELL_NETWORK=$([[ -d $parent/network ]] && echo $parent/network || echo /opt/bash/shell/network)
|
||||||
|
# or comment above and set explictly
|
||||||
|
# export BASH_SHELL_NETWORK=<some directory>
|
||||||
|
|
||||||
declare domain
|
declare domain
|
||||||
BASH_SHELL_NETWORK_DIRS=""
|
BASH_SHELL_NETWORK_DIRS=""
|
||||||
for domain in "${NETWORK_DOMAINS[@]}"; do
|
for domain in "${NETWORK_DOMAINS[@]}"; do
|
||||||
|
@ -70,8 +77,9 @@ fi
|
||||||
unset domain
|
unset domain
|
||||||
export BASH_SHELL_NETWORK_DIRS
|
export BASH_SHELL_NETWORK_DIRS
|
||||||
|
|
||||||
# will use $BASH_SHELL_HOST/<hostname> unless specifically set
|
export BASH_SHELL_HOST=$([[ -d $parent/host ]] && echo $parent/host || echo /opt/bash/shell/host)
|
||||||
export BASH_SHELL_HOST=/opt/bash/shell/host
|
# or comment above and set explictly
|
||||||
|
# export BASH_SHELL_HOST=<some directory>
|
||||||
|
|
||||||
# by default SHELL sources will be looked for under $HOME/bash/shell
|
# by default SHELL sources will be looked for under $HOME/bash/shell
|
||||||
# but can be user set below to $HOME/$BASH_SHELL_USER
|
# but can be user set below to $HOME/$BASH_SHELL_USER
|
||||||
|
|
Reference in New Issue