Make sed command a variable
This commit is contained in:
@@ -3,6 +3,8 @@
|
|||||||
EXTENSION = cartodb
|
EXTENSION = cartodb
|
||||||
EXTVERSION = 0.2.0dev
|
EXTVERSION = 0.2.0dev
|
||||||
|
|
||||||
|
SED = sed
|
||||||
|
|
||||||
CDBSCRIPTS = \
|
CDBSCRIPTS = \
|
||||||
scripts-available/CDB_Roles.sql \
|
scripts-available/CDB_Roles.sql \
|
||||||
scripts-enabled/*.sql \
|
scripts-enabled/*.sql \
|
||||||
@@ -21,9 +23,9 @@ UPGRADABLE = \
|
|||||||
|
|
||||||
UPGRADES = \
|
UPGRADES = \
|
||||||
$(shell echo $(UPGRADABLE) | \
|
$(shell echo $(UPGRADABLE) | \
|
||||||
sed 's/^/$(EXTENSION)--/' | \
|
$(SED) 's/^/$(EXTENSION)--/' | \
|
||||||
sed 's/$$/--$(EXTVERSION).sql/' | \
|
$(SED) 's/$$/--$(EXTVERSION).sql/' | \
|
||||||
sed 's/ /--$(EXTVERSION).sql $(EXTENSION)--/g')
|
$(SED) 's/ /--$(EXTVERSION).sql $(EXTENSION)--/g')
|
||||||
|
|
||||||
REV=$(shell git describe)
|
REV=$(shell git describe)
|
||||||
|
|
||||||
@@ -48,7 +50,7 @@ include $(PGXS)
|
|||||||
$(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_version.sql Makefile
|
$(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_version.sql Makefile
|
||||||
echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
|
echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
|
||||||
cat $(CDBSCRIPTS) | \
|
cat $(CDBSCRIPTS) | \
|
||||||
sed -e 's/\<public\./cartodb./g' \
|
$(SED) -e 's/\<public\./cartodb./g' \
|
||||||
-e 's/:DATABASE_USERNAME/cdb_org_admin/g' >> $@
|
-e 's/:DATABASE_USERNAME/cdb_org_admin/g' >> $@
|
||||||
echo "GRANT USAGE ON SCHEMA cartodb TO public;" >> $@
|
echo "GRANT USAGE ON SCHEMA cartodb TO public;" >> $@
|
||||||
cat cartodb_version.sql >> $@
|
cat cartodb_version.sql >> $@
|
||||||
@@ -63,10 +65,10 @@ $(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: $(EXTENSION)--$(EXTVERSION).
|
|||||||
cp $< $@
|
cp $< $@
|
||||||
|
|
||||||
$(EXTENSION).control: $(EXTENSION).control.in Makefile
|
$(EXTENSION).control: $(EXTENSION).control.in Makefile
|
||||||
sed -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@
|
$(SED) -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@
|
||||||
|
|
||||||
cartodb_version.sql: cartodb_version.sql.in Makefile
|
cartodb_version.sql: cartodb_version.sql.in Makefile
|
||||||
sed -e 's/@@VERSION@@/$(EXTVERSION) $(REV)/' $< > $@
|
$(SED) -e 's/@@VERSION@@/$(EXTVERSION) $(REV)/' $< > $@
|
||||||
|
|
||||||
legacy_regress: $(REGRESS_OLD) Makefile
|
legacy_regress: $(REGRESS_OLD) Makefile
|
||||||
mkdir -p sql/test/
|
mkdir -p sql/test/
|
||||||
@@ -80,7 +82,7 @@ legacy_regress: $(REGRESS_OLD) Makefile
|
|||||||
echo '\\t' >> $${of}; \
|
echo '\\t' >> $${of}; \
|
||||||
echo '\\set QUIET off' >> $${of}; \
|
echo '\\set QUIET off' >> $${of}; \
|
||||||
cat $${f} | \
|
cat $${f} | \
|
||||||
sed -e 's/\<public\./cartodb./g' >> $${of}; \
|
$(SED) -e 's/\<public\./cartodb./g' >> $${of}; \
|
||||||
exp=expected/test/$${tn}.out; \
|
exp=expected/test/$${tn}.out; \
|
||||||
echo '\\set ECHO off' > $${exp}; \
|
echo '\\set ECHO off' > $${exp}; \
|
||||||
cat test/$${tn}_expect >> $${exp}; \
|
cat test/$${tn}_expect >> $${exp}; \
|
||||||
|
|||||||
Reference in New Issue
Block a user