diff options
| author | Miquel Lionel <lionel@les-miquelots.net> | 2021-06-06 15:38:58 +0100 |
|---|---|---|
| committer | Miquel Lionel <lionelmiquel@sfr.fr> | 2021-06-06 15:38:58 +0100 |
| commit | 4647fb1052e4b13173059290fcb7e97c9596f9a5 (patch) | |
| tree | 563304a3c288851d33a37aed13cf66778d4bcc46 | |
| parent | bfe2259a237215da3dc43f0bfc9563e1d43f943f (diff) | |
| parent | 0d0ec0c1c57999db567e2a538bdd6e8976a68b8e (diff) | |
| download | gpigeon-4647fb1052e4b13173059290fcb7e97c9596f9a5.tar.gz gpigeon-4647fb1052e4b13173059290fcb7e97c9596f9a5.zip | |
Merge branch 'master' of ssh://lilimgit:/gpigeon
- what was this conflict
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -57,6 +57,9 @@ gpigeon: gpigeon-template.cgi link-tmpl-template.cgi printf "\nAnd the hash is:\n${BOLD}%s${STOP}\n\n" '${RANDOM_ARGON2}'; \ rm -f genpass.txt; \ fi + + + @if test -n '$(MYGPG_ID_0XLONG)'; then \ printf "Mails will be encrypted to you with the ${BOLD}$(MYGPG_ID_0XLONG)${STOP} GPG key\n"; \ sed -e 's|gpgid_goes_here|$(MYGPG_ID_0XLONG)|g' link-tmpl-template.cgi > link-tmpl.cgi; \ @@ -84,9 +87,6 @@ gpigeon: gpigeon-template.cgi link-tmpl-template.cgi $(MAKE) clean ; \ exit 1; \ fi - - - @if [ '${HAS_MAILSERVER}' == '1' ]; then \ printf "Local mail server setup. ${BOLD}Mail::Sendmail module will be used to send the mails${STOP}.\n"; \ else \ |