From ca07c81f13e0abbf4958c7544adf4c6e7894df31 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 4 Jun 2014 15:11:30 +0200 Subject: [PATCH] Make sed usage more compatible ... and a bit less safe Might close #35 --- Makefile | 4 ++-- README.md | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 55d0bbf..3881e89 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ include $(PGXS) $(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_version.sql Makefile echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@ cat $(CDBSCRIPTS) | \ - $(SED) -e 's/\> $@ echo "GRANT USAGE ON SCHEMA cartodb TO public;" >> $@ cat cartodb_version.sql >> $@ @@ -82,7 +82,7 @@ legacy_regress: $(REGRESS_OLD) Makefile echo '\\t' >> $${of}; \ echo '\\set QUIET off' >> $${of}; \ cat $${f} | \ - $(SED) -e 's/\> $${of}; \ + $(SED) -e 's/public\./cartodb./g' >> $${of}; \ exp=expected/test/$${tn}.out; \ echo '\\set ECHO off' > $${exp}; \ cat test/$${tn}_expect >> $${exp}; \ diff --git a/README.md b/README.md index 62f2a6c..5431fce 100644 --- a/README.md +++ b/README.md @@ -102,15 +102,3 @@ Starting with 0.2.0, the in-place reload can be done with an ad-hoc function: SELECT cartodb.cdb_extension_reload(); ``` -Troubleshooting ---------------- - -### Mac OS X sed - -Mac OS X comes with sed from FreeBSD, some scripting in Makefile is -incompatible with that version of sed so we recommend you to install -GNU sed. The easiest way is via [Homebrew](http://brew.sh/) like in: - -```sh -brew install gnu-sed --default-names -```