nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts/*: fix quoting and rm antiqe expr condition

Browse Source
This commit is contained in:
Jan-Tarek Butt 2019-10-12 12:56:52 +02:00
parent 606cbae71e
commit 22442c5fcd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/features.sh
View File

@ -51,7 +51,7 @@ packages() {
shift shift
# We only allow variable names, parentheses and the operators: & | ! # We only allow variable names, parentheses and the operators: & | !
if [ "$(expr match "$cond" '.*[^A-Za-z0-9_()&|! ].*')" -gt 0 ]; then if grep -q ".*[^A-Za-z0-9_()&|! ].*" <<< "$cond"; then
exit 1 exit 1
fi fi

2
scripts/modules.sh
View File

@ -1,7 +1,7 @@
. ./modules . ./modules
[ ! -f "$GLUON_SITEDIR"/modules ] || . "$GLUON_SITEDIR"/modules [ ! -f "$GLUON_SITEDIR"/modules ] || . "$GLUON_SITEDIR"/modules
FEEDS="$(echo $GLUON_FEEDS $GLUON_SITE_FEEDS | tr ' ' '\n')" FEEDS="$(echo "$GLUON_FEEDS" "$GLUON_SITE_FEEDS" | tr ' ' '\n')"
GLUON_MODULES=openwrt GLUON_MODULES=openwrt