Browse Source
Update _cmd_build
rework custom folder rules
1. _default_confdir
2. _custom_confdir cmd overrules toolchaincfg
pull/57/head
Gorgone
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
15 additions and
10 deletions
-
support/functions/_cmd_build
|
|
|
@ -126,20 +126,25 @@ _cmd_build(){ |
|
|
|
done |
|
|
|
|
|
|
|
#change default oscam CONF_DIR |
|
|
|
if [ "$CUSTOM_CONFDIR" == "not_set" ] && [ ${#_oscamconfdir_custom} -lt 4 ]; |
|
|
|
then |
|
|
|
CONFDIR="$_oscamconfdir_default" |
|
|
|
cdtag="CONF_DIR=$CONFDIR" |
|
|
|
elif [ ${#_oscamconfdir_custom} -gt 4 ]; |
|
|
|
|
|
|
|
CONFDIR="$_oscamconfdir_default" |
|
|
|
cdtag="CONF_DIR=$CONFDIR" |
|
|
|
|
|
|
|
if [ ! -z "$_oscamconfdir_custom" ]; |
|
|
|
then |
|
|
|
if [ ! "$_oscamconfdir_custom" == "not_set" ]; |
|
|
|
then |
|
|
|
CONFDIR="$_oscamconfdir_custom" |
|
|
|
cdtag="${r_l}custom CONF_DIR=$CONFDIR (via toolchain.cfg)" |
|
|
|
cdtag="${r_l}custom CONF_DIR=$_oscamconfdir_custom (via toolchain.cfg)" |
|
|
|
fi |
|
|
|
fi |
|
|
|
if [ ${#CUSTOM_CONFDIR} -gt 4 ]; |
|
|
|
|
|
|
|
if [ ! "$CUSTOM_CONFDIR" == "not_set" ]; |
|
|
|
then |
|
|
|
CONFDIR="$CUSTOM_CONFDIR" |
|
|
|
cdtag="${r_l}custom CONF_DIR=$CONFDIR (via commandline)" |
|
|
|
CONFDIR="$_oscamconfdir_custom" |
|
|
|
cdtag="${r_l}custom CONF_DIR=$CUSTOM_CONFDIR (via CUSTOM_CONFDIR)" |
|
|
|
fi |
|
|
|
|
|
|
|
printf "$y_l\n | set : ${cdtag}$w_l" |
|
|
|
|
|
|
|
#patching |
|
|
|
|
