diff --git a/runphp/runphp b/runphp/runphp index 03a46f5..e8e8367 100755 --- a/runphp/runphp +++ b/runphp/runphp @@ -276,7 +276,15 @@ function host_init_env() { ;; esac } - [ -f ~/.dkbuild.env ] && source ~/.dkbuild.env + envs=( + /etc/default/dkbuild + ~/etc/default.${HOSTNAME%%.*}/dkbuild + ~/etc/default/dkbuild + ~/.dkbuild.env + ) + for env in "${envs[@]}"; do + [ -f "$env" ] && source "$env" + done [ -n "$APT_PROXY" ] || APT_PROXY= [ -n "$APT_MIRROR" ] || APT_MIRROR=default [ -n "$SEC_MIRROR" ] || SEC_MIRROR=default