Skip to content
Snippets Groups Projects
Commit 9c200269 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'osx-sed' into 'master'

Fix osx sed

See merge request !70
parents e22643c2 63daa253
Branches
Tags
1 merge request!70Fix osx sed
......@@ -18,8 +18,6 @@ notifications:
on_failure: always
matrix:
fast_finish: true
allow_failures:
- os: osx
env:
global:
- PKG_CONFIG_PATH="${HOME}/.local/lib/pkgconfig"
......
......@@ -174,7 +174,6 @@ static int net_listen_addrs(lua_State *L, int port, int flags)
lua_getfield(L, -1, "addr");
if (!lua_isnil(L, -1)) {
lua_replace(L, -2);
kr_log_info(" .addr\n");
} else {
lua_pop(L, 1);
}
......@@ -182,7 +181,6 @@ static int net_listen_addrs(lua_State *L, int port, int flags)
/* Case: string, representing a single address. */
const char *str = lua_tostring(L, -1);
if (str != NULL) {
kr_log_info(" string\n");
struct engine *engine = engine_luaget(L);
int ret = network_listen(&engine->net, str, port, flags);
if (ret != 0) {
......
#!/bin/sh
set -e
# clean unnecessary stuff from the lua file
alias strip="sed -e 's/^[\t ]*//g; s/ */ /g; /^--/d; /^$/d'"
# Clean unnecessary stuff from the lua file; note the significant tabulator.
alias strip="sed -e 's/^[ ]*//g; s/ */ /g; /^--/d; /^$/d'"
if command -v xxd > /dev/null 2>&1; then
strip < "$1" | xxd -i -
else
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment