pman: support des config standard nommées
This commit is contained in:
parent
192a7f52c3
commit
939f7726ab
@ -210,6 +210,9 @@ function load_branches() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function load_config() {
|
function load_config() {
|
||||||
|
if [ "${ConfigFile#::}" != "$ConfigFile" ]; then
|
||||||
|
ConfigFile="$NULIBDIR/bash/src/pman${ConfigFile#::}.conf.sh"
|
||||||
|
fi
|
||||||
if [ -n "$ConfigFile" ]; then
|
if [ -n "$ConfigFile" ]; then
|
||||||
source "$ConfigFile" || die || return
|
source "$ConfigFile" || die || return
|
||||||
elif [ -n "$ConfigBranch" ]; then
|
elif [ -n "$ConfigBranch" ]; then
|
||||||
@ -224,7 +227,7 @@ function load_config() {
|
|||||||
elif [ -f .pman.conf ]; then
|
elif [ -f .pman.conf ]; then
|
||||||
ConfigFile="$(pwd)/.pman.conf"
|
ConfigFile="$(pwd)/.pman.conf"
|
||||||
source "$ConfigFile"
|
source "$ConfigFile"
|
||||||
elif [ -n "${MYNAME#prel}" ]; then
|
elif [ -n "$1" -a -n "${MYNAME#$1}" ]; then
|
||||||
ConfigFile="$NULIBDIR/bash/src/pman${MYNAME#$1}.conf.sh"
|
ConfigFile="$NULIBDIR/bash/src/pman${MYNAME#$1}.conf.sh"
|
||||||
source "$ConfigFile"
|
source "$ConfigFile"
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user