Skip to content

Always use a sharp (#) symbol as a sed(1) separator. #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
osokin wants to merge 1 commit into from
Closed

Always use a sharp (#) symbol as a sed(1) separator. #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion auto/libxml2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if [ $NJS_LIBXML2 = YES ]; then
# pkg-config

njs_feature="libxml2 via pkg-config"
njs_feature_incs=`pkg-config libxml-2.0 --cflags | sed -n -e 's/.*-I *\([^ ][^ ]*\).*/\1/p'`
njs_feature_incs=`pkg-config libxml-2.0 --cflags | sed -n -e 's#.*-I *\([^ ][^ ]*\).*#\1#p'`
njs_feature_libs=`pkg-config libxml-2.0 --libs`

. auto/feature
Expand Down
14 changes: 7 additions & 7 deletions auto/make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ NJS_STATIC_LINK = ${AR} -r -c
NJS_LINK = ${CC} ${NJS_LD_OPT}
NJS_CFLAGS = ${NJS_CFLAGS} ${NJS_CC_OPT} ${CFLAGS}

NJS_VER = $(grep NJS_VERSION src/njs.h | sed -e 's/.*"\(.*\)".*/\1/')
NJS_VER = $(grep NJS_VERSION src/njs.h | sed -e 's#.*"\(.*\)".*#\1#')
NJS_TYPES_VER = \$(NJS_VER)

NPM = npm
Expand Down Expand Up @@ -275,7 +275,7 @@ cat << END >> $NJS_MAKEFILE
$NJS_BUILD_DIR/ts/package.json: $njs_ts_deps
cp -fr ts $NJS_BUILD_DIR/
cp LICENSE $NJS_BUILD_DIR/ts/
sed 's/__VERSION__/"\$(NJS_TYPES_VER)"/' \\
sed 's#__VERSION__#"\$(NJS_TYPES_VER)"#' \\
ts/package.json > $NJS_BUILD_DIR/ts/package.json

$NJS_BUILD_DIR/ts/node_modules: $NJS_BUILD_DIR/ts/package.json
Expand Down Expand Up @@ -320,11 +320,11 @@ cat << END >> $NJS_MAKEFILE
pc: $NJS_BUILD_DIR/njs.pc

$NJS_BUILD_DIR/njs.pc: $NJS_BUILD_DIR/njs_auto_config.h
sed -e "s,@PREFIX@,$(pwd)/$NJS_BUILD_DIR," \\
-e "s,@LIBDIR@,$(pwd)/$NJS_BUILD_DIR," \\
-e "s,@CFLAGS@,-I$(pwd)/$NJS_BUILD_DIR -I$(pwd)/src," \\
-e "s,@VERSION@,\$(NJS_VER)," \\
-e "s,@EXTRA_LIBS@,-lm $NJS_LIBS $NJS_LIB_AUX_LIBS," \\
sed -e "s#@PREFIX@#$(pwd)/$NJS_BUILD_DIR#" \\
-e "s#@LIBDIR@#$(pwd)/$NJS_BUILD_DIR#" \\
-e "s#@CFLAGS@#-I$(pwd)/$NJS_BUILD_DIR -I$(pwd)/src#" \\
-e "s#@VERSION@#\$(NJS_VER)#" \\
-e "s#@EXTRA_LIBS@#-lm $NJS_LIBS $NJS_LIB_AUX_LIBS#" \\
src/njs.pc.in > \$@
END

Expand Down
4 changes: 2 additions & 2 deletions auto/options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ NJS_CONFIGURE_OPTIONS=
for njs_option
do
case "$njs_option" in
-*=*) value=`echo "$njs_option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-*=*) value=`echo "$njs_option" | sed -e 's#[-_a-zA-Z0-9]*=##'` ;;
*) value="" ;;
esac

Expand Down Expand Up @@ -70,7 +70,7 @@ do
;;
esac

njs_opt=`echo $njs_option | sed -e "s/\(--[^=]*=\)\(.* .*\)/\1'\2'/"`
njs_opt=`echo $njs_option | sed -e "s#\(--[^=]*=\)\(.* .*\)#\1'\2'#"`

NJS_CONFIGURE_OPTIONS="$NJS_CONFIGURE_OPTIONS $njs_opt"

Expand Down
2 changes: 1 addition & 1 deletion auto/zlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if [ $NJS_ZLIB = YES ]; then
# pkg-config

njs_feature="zlib via pkg-config"
njs_feature_incs=`pkg-config zlib --cflags | sed -n -e 's/.*-I *\([^ ][^ ]*\).*/\1/p'`
njs_feature_incs=`pkg-config zlib --cflags | sed -n -e 's#.*-I *\([^ ][^ ]*\).*#\1#p'`
njs_feature_libs=`pkg-config zlib --libs`

. auto/feature
Expand Down