mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 20:13:32 +01:00
$(TOPDIR), make, scripts: Merged changes from V_1_1_31_6_POST_ACCEPTANCE
This commit is contained in:
parent
1e1e1d4ca8
commit
d1857e8d77
14 changed files with 251 additions and 60 deletions
|
|
@ -84,6 +84,11 @@ _ytools_source_section()
|
|||
eval `_ytools_cat_section $* | _ytools_format_config`
|
||||
}
|
||||
|
||||
_uniq()
|
||||
{
|
||||
sed -n 'G; s/\n/&&/; /^\([ -~]*\n\).*\n\1/d; s/\n//; h; P'
|
||||
}
|
||||
|
||||
# -- exported utilities
|
||||
ytools_log_err()
|
||||
{
|
||||
|
|
@ -306,12 +311,12 @@ ytools_config_sections()
|
|||
sed "
|
||||
/^[ ]*\[$o_section\.\(.*\)\]/ !d
|
||||
s/^[ ]*\[$o_section\.\(.*\)\].*/\1/
|
||||
" $o_file 2>/dev/null | sort -u
|
||||
" $o_file 2>/dev/null | _uniq
|
||||
else
|
||||
sed "
|
||||
/^[ ]*\[\(.*\)\]/ !d
|
||||
s/^[ ]*\[\(.*\)\].*/\1/
|
||||
" $o_file 2>/dev/null | sort -u
|
||||
" $o_file 2>/dev/null | _uniq
|
||||
fi
|
||||
|
||||
else
|
||||
|
|
@ -320,12 +325,12 @@ ytools_config_sections()
|
|||
sed "
|
||||
/^[ ]*\[$o_section\.\([^.]*\)\]/ !d
|
||||
s/^[ ]*\[$o_section\.\([^.]*\)\].*/\1/
|
||||
" $o_file 2>/dev/null | sort -u
|
||||
" $o_file 2>/dev/null | _uniq
|
||||
else
|
||||
sed "
|
||||
/^[ ]*\[\([^.]*\)\]/ !d
|
||||
s/^[ ]*\[\([^.]*\)\].*/\1/
|
||||
" $o_file 2>/dev/null | sort -u
|
||||
" $o_file 2>/dev/null | _uniq
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue