From 33814719333c2c5b7b13ab47f9c8d4f8a0cecb16 Mon Sep 17 00:00:00 2001
From: Markus Heiser
Date: Wed, 25 Mar 2020 17:48:34 +0100
Subject: [PATCH] brands: add ISSUE_URL
Signed-off-by: Markus Heiser
---
Makefile | 2 ++
searx/brand.py | 1 +
searx/templates/oscar/base.html | 2 +-
searx/templates/simple/base.html | 2 +-
setup.py | 6 +++++-
5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 5796ae668..bdaa6c774 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
# -*- coding: utf-8; mode: makefile-gmake -*-
export GIT_URL=https://github.com/asciimoo/searx
+export ISSUE_URL=$(GIT_URL)/issues
export SEARX_URL=https://searx.me
export DOCS_URL=https://asciimoo.github.io/searx
@@ -86,6 +87,7 @@ engines-languages: pyenvinstall
searx.brand:
$(Q)echo "build searx/brand.py"
$(Q)echo "GIT_URL = '$(GIT_URL)'" > searx/brand.py
+ $(Q)echo "ISSUE_URL = '$(ISSUE_URL)'" >> searx/brand.py
$(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py
$(Q)echo "DOCS_URL = '$(DOCS_URL)'" >> searx/brand.py
$(Q)echo "PUBLIC_INSTANCES = 'https://searx.space'" >> searx/brand.py
diff --git a/searx/brand.py b/searx/brand.py
index 7cbca7b0f..d563447f6 100644
--- a/searx/brand.py
+++ b/searx/brand.py
@@ -1,4 +1,5 @@
GIT_URL = 'https://github.com/asciimoo/searx'
+ISSUE_URL = 'https://github.com/asciimoo/searx/issues'
SEARX_URL = 'https://searx.me'
DOCS_URL = 'https://asciimoo.github.io/searx'
PUBLIC_INSTANCES = 'https://searx.space'
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 4fe335798..5eb4462e4 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -87,7 +87,7 @@
{{ _('Powered by') }} searx - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}
{{ _('Source code') }} |
- {{ _('Issue tracker') }} |
+ {{ _('Issue tracker') }} |
{{ _('Public instances') }}
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html
index b5b184071..71df123ea 100644
--- a/searx/templates/simple/base.html
+++ b/searx/templates/simple/base.html
@@ -52,7 +52,7 @@
{{ _('Powered by') }} searx - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}
{{ _('Source code') }} |
- {{ _('Issue tracker') }} |
+ {{ _('Issue tracker') }} |
{{ _('Public instances') }}
diff --git a/setup.py b/setup.py
index bd00211b2..97a3270ef 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,11 @@ setup(
version=VERSION_STRING,
description="A privacy-respecting, hackable metasearch engine",
long_description=long_description,
+ url=brand.DOCS_URL,
+ project_urls={
+ "Code": brand.GIT_URL,
+ "Issue tracker": brand.ISSUE_URL
+ },
classifiers=[
"Development Status :: 4 - Beta",
"Programming Language :: Python",
@@ -37,7 +42,6 @@ setup(
keywords='metasearch searchengine search web http',
author='Adam Tauber',
author_email='asciimoo@gmail.com',
- url=brand.GIT_URL,
license='GNU Affero General Public License',
packages=find_packages(exclude=["tests*"]),
zip_safe=False,