merchant

commit c4231013e5759cfd0490eb8e6ec1abee768a98c5
parent 466dcea5cc46f47873a602656cb2eb70e390f3a2
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Fri, 28 Apr 2017 11:47:37 +0200

NOT using setuptools' "scripts" keyword as it
failed to set execution permissions on deployed files

Diffstat:
M
.gitignore
 | 
1
+
M
src/mitm/Makefile.in
 | 
6
++----
M
src/mitm/setup.py
 | 
1
-
M
src/mitm/taler-merchant-mitm.in
 | 
1
+

4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *~
 *Makefile.in
+!src/mitm/*.in
 *Makefile
 aclocal.m4
 autom4te.cache
diff --git a/src/mitm/Makefile.in b/src/mitm/Makefile.in
@@ -1,15 +1,13 @@
-INSTALL = install -m 644 -Dt
 
 .PHONY: all
 all:
 	true
 
-
 .PHONY: install-data
 install-data:
-	$(INSTALL) @prefix@/share/taler/ merchant-mitm.wsgi
+	install -m 444 -Dt @prefix@/share/taler/ merchant-mitm.wsgi
 
 .PHONY: install
 install: install-data
-	$(INSTALL) @prefix@/bin/ taler-merchant-mitm
 	pip3 install . --install-option="--prefix=@prefix@"
+	install -m 544 -Dt @prefix@/bin taler-merchant-mitm
diff --git a/src/mitm/setup.py b/src/mitm/setup.py
@@ -8,5 +8,4 @@ setup(name='talermerchantmitm',
       license='GPL',
       packages=find_packages(),
       install_requires=["Flask>=0.10"],
-      scripts=['taler-merchant-mitm'],
       zip_safe=False)
diff --git a/src/mitm/taler-merchant-mitm.in b/src/mitm/taler-merchant-mitm.in
@@ -36,6 +36,7 @@ if getattr(args, 'exchange_url', None) is None:
 
 uwsgi_logfmt = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)"
 
+os.environ["TALER_EXCHANGE_URL"] = args.exchange_url
 os.execlp("uwsgi", "uwsgi",
             "--master",
             "--die-on-term",