Corrected tools/combine to handle relative require paths
parent
4e3d609b01
commit
ad5291eb8d
|
@ -33,8 +33,13 @@ RMTRAIL="$PATH_TOOLS/rmtrail"
|
||||||
cat_modules=$(
|
cat_modules=$(
|
||||||
cd "$PATH_TOOLS/../" &&
|
cd "$PATH_TOOLS/../" &&
|
||||||
grep -rIo ' require(.*)' lib/ \
|
grep -rIo ' require(.*)' lib/ \
|
||||||
| sed "s/^lib\///;s/\.js://;s/require( *'\.\/\(.*\)'.*/\1/" \
|
| sed " \
|
||||||
| node tools/combine-order.js
|
s/^lib\/\(\(.\+\/\)\?[^/]\+\)\.js: /\1 \2/;
|
||||||
|
s/require( *'\(.*\)'.*/\1/;
|
||||||
|
s/[^/\]\+\/\.\.//g;
|
||||||
|
s/\( \|\/\)\.\//\1/g;
|
||||||
|
" \
|
||||||
|
| node tools/combine-order.js \
|
||||||
) || {
|
) || {
|
||||||
echo "Failed to get module list" >&2
|
echo "Failed to get module list" >&2
|
||||||
exit 3
|
exit 3
|
||||||
|
|
Loading…
Reference in New Issue