diff options
| author | Rob Landley <rob@landley.net> | 2019-01-19 16:58:04 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2019-01-19 16:58:04 -0600 |
| commit | 84ef9083fbb8435031b0f0ff8ac03324ce2d0e6f (patch) | |
| tree | 6e166523b5c2508837f3ba63392198418baa77ad /scripts/genconfig.sh | |
| parent | 81207825c50fa9a4ec1475024543f830dee247fd (diff) | |
| download | toybox-84ef9083fbb8435031b0f0ff8ac03324ce2d0e6f.tar.gz | |
Factor out scripts/portability.sh and have genconfig.sh use it to find sed/gsed.
Diffstat (limited to 'scripts/genconfig.sh')
| -rwxr-xr-x | scripts/genconfig.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh index 3887b077..c4940dfd 100755 --- a/scripts/genconfig.sh +++ b/scripts/genconfig.sh @@ -6,6 +6,7 @@ mkdir -p generated source configure +source scripts/portability.sh probecc() { @@ -129,7 +130,7 @@ genconfig() do # Grab the config block for Config.in echo "# $i" - sed -n '/^\*\//q;/^config [A-Z]/,$p' $i || return 1 + $SED -n '/^\*\//q;/^config [A-Z]/,$p' $i || return 1 echo done @@ -144,7 +145,7 @@ genconfig > generated/Config.in || rm generated/Config.in toys() { grep 'TOY(.*)' "$@" | grep -v TOYFLAG_NOFORK | grep -v "0))" | \ - sed -En 's/([^:]*):.*(OLD|NEW)TOY\( *([a-zA-Z][^,]*) *,.*/\1:\3/p' + $SED -En 's/([^:]*):.*(OLD|NEW)TOY\( *([a-zA-Z][^,]*) *,.*/\1:\3/p' } WORKING= @@ -163,5 +164,5 @@ done && echo -e "clean::\n\trm -f $WORKING $PENDING" && echo -e "list:\n\t@echo $(echo $WORKING | tr ' ' '\n' | sort | xargs)" && echo -e "list_pending:\n\t@echo $(echo $PENDING | tr ' ' '\n' | sort | xargs)" && -echo -e ".PHONY: $WORKING $PENDING" | sed 's/ \([^ ]\)/ test_\1/g' +echo -e ".PHONY: $WORKING $PENDING" | $SED 's/ \([^ ]\)/ test_\1/g' ) > .singlemake |