diff options
| author | Horus3 | 2016-03-11 19:32:20 +0100 |
|---|---|---|
| committer | Horus3 | 2016-03-11 19:32:20 +0100 |
| commit | c43afce9dd630f207ea8522ba4ecbba7942d1c66 (patch) | |
| tree | 41de16f8440d9f3e15a82bd8874fc29d0d949262 | |
| parent | b3501dabc1a708cd5638cb6d04e7413c049fc187 (diff) | |
| download | freemail-c43afce9dd630f207ea8522ba4ecbba7942d1c66.tar.gz | |
Simplifiziert das Makefile für die gen_env Regel.
| -rw-r--r-- | Makefile | 37 |
1 files changed, 9 insertions, 28 deletions
@@ -157,7 +157,11 @@ gen_config: _test_build echo "export FREEMAIL_HTTP_IP=$(FREEMAIL_HTTP_IP)" >> _env.sh echo "export FREEMAIL_HTTP_PORT=$(FREEMAIL_HTTP_PORT)" >> _env.sh @echo "" - echo "export FREEMAIL_SECRET=$(FREEMAIL_SECRET)" >> _env.sh + @if [ ! -z "$(FREEMAIL_SECRET)" ]; then \ + echo "FREEMAIL_SECRET=$(FREEMAIL_SECRET)" >> _env.sh; \ + else \ + echo "FREEMAIL_SECRET=$$(echo $$RANDOM | sha256sum | cut -d ' ' -f1 )" >> _env.sh; \ + fi @echo "" @echo "# Smtp" >> _env.sh echo "export FREEMAIL_SMTP_MAILER_MX=$(FREEMAIL_SMTP_MAILER_MX)" >> _env.sh @@ -195,31 +199,8 @@ _test_vagrant_env: vagrant: _test_vagrant_env go_get build pack mv $(APP).tar.gz $(VAGRANT_DIR) -gen_env: +gen_env: gen_config + #@if [ ! -d _env.sh ]; then make gen_config; fi @echo "Generating environment file!\n" - @echo "# Database" >> environment - echo "FREEMAIL_DB_DRIVER=$(FREEMAIL_DB_DRIVER)" >> environment - echo "FREEMAIL_DB_CREDENTIALS=$(FREEMAIL_DB_CREDENTIALS)" >> environment - echo "FREEMAIL_DB_IMPORT_DRIVER=$(FREEMAIL_DB_IMPORT_DRIVER)" >> environment - echo "FREEMAIL_DB_LOG=$(FREEMAIL_DB_LOG)\n" >> environment - @echo "" - @echo "# Redis" >> environment - echo "FREEMAIL_REDIS_SERVER=$(FREEMAIL_REDIS_SERVER)" >> environment - echo "FREEMAIL_REDIS_PORT=$(FREEMAIL_REDIS_PORT)\n" >> environment - @echo "" - @echo "# Http" >> environment - echo "FREEMAIL_HTTP_IP=$(FREEMAIL_HTTP_IP)" >> environment - echo "FREEMAIL_HTTP_PORT=$(FREEMAIL_HTTP_PORT)" >> environment - @echo "" - @if [ ! -z "$(FREEMAIL_SECRET)" ]; then \ - echo "FREEMAIL_SECRET=$(FREEMAIL_SECRET)" >> environment; \ - else \ - echo "FREEMAIL_SECRET=$$(echo $$RANDOM | sha256sum | cut -d ' ' -f1 )" >> environment; \ - fi - @echo "" - @echo "# Smtp" >> environment - echo "FREEMAIL_SMTP_MAILER_MX=$(FREEMAIL_SMTP_MAILER_MX)" >> environment - echo "FREEMAIL_SMTP_PASSWORD=$(FREEMAIL_SMTP_PASSWORD)" >> environment - echo "FREEMAIL_SMTP_ADRESS=$(FREEMAIL_SMTP_ADRESS)" >> environment - echo "LOGDIR=$(LOGDIR)" >> environment - + @sed -e 's/export //g' _env.sh >> environment + @sed -ie 's|#!/bin/sh||g' environment |