build environment: add GIT_BRANCH variable

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

Makefile

@@ -2,6 +2,7 @@
 .DEFAULT_GOAL=help
 
 export GIT_URL=https://github.com/asciimoo/searx
+export GIT_BRANCH=master
 export SEARX_URL=https://searx.me
 export DOCS_URL=https://asciimoo.github.io/searx
 
@@ -114,12 +115,14 @@ useragents.update:  pyenvinstall
 searx.brand:
 	$(Q)echo "build searx/brand.py"
 	$(Q)echo "GIT_URL = '$(GIT_URL)'"  > searx/brand.py
+	$(Q)echo "GIT_BRANCH = '$(GIT_BRANCH)'"  >> searx/brand.py
 	$(Q)echo "ISSUE_URL = 'https://github.com/asciimoo/searx/issues'" >> 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
 	$(Q)echo "build utils/brand.env"
 	$(Q)echo "export GIT_URL='$(GIT_URL)'"  > utils/brand.env
+	$(Q)echo "export GIT_BRANCH='$(GIT_BRANCH)'"  >> utils/brand.env
 	$(Q)echo "export ISSUE_URL='https://github.com/asciimoo/searx/issues'" >> utils/brand.env
 	$(Q)echo "export SEARX_URL='$(SEARX_URL)'" >> utils/brand.env
 	$(Q)echo "export DOCS_URL='$(DOCS_URL)'" >> utils/brand.env

docs/conf.py

@@ -6,7 +6,7 @@ from searx.version import VERSION_STRING
 from pallets_sphinx_themes import ProjectLink
 
 from searx.brand import GIT_URL
-GIT_BRANCH =os.environ.get("GIT_BRANCH", "master")
+GIT_BRANCH = os.environ.get("GIT_BRANCH", "master")
 from searx.brand import SEARX_URL
 from searx.brand import DOCS_URL
 

docs/dev/makefile.rst

@@ -46,9 +46,9 @@ Makefile setup
 
 The main setup is done in the :origin:`Makefile`::
 
-  export SEARX_URL=https://searx.me
-
   export GIT_URL=https://github.com/asciimoo/searx
+  export GIT_BRANCH=master
+  export SEARX_URL=https://searx.me
   export DOCS_URL=https://asciimoo.github.io/searx
 
 .. sidebar:: fork & upstream
@@ -58,6 +58,8 @@ The main setup is done in the :origin:`Makefile`::
 
 :GIT_URL: Changes this, to point to your searx fork.
 
+:GIT_BRANCH: Changes this, to point to your searx branch.
+
 :SEARX_URL: Changes this, to point to your searx instance.
 
 :DOCS_URL: If you host your own (branded) documentation, change this URL.

searx/brand.py

@@ -1,4 +1,5 @@
 GIT_URL = 'https://github.com/asciimoo/searx'
+GIT_BRANCH = 'master'
 ISSUE_URL = 'https://github.com/asciimoo/searx/issues'
 SEARX_URL = 'https://searx.me'
 DOCS_URL = 'https://asciimoo.github.io/searx'

utils/brand.env

@@ -1,4 +1,5 @@
 export GIT_URL='https://github.com/asciimoo/searx'
+export GIT_BRANCH='master'
 export ISSUE_URL='https://github.com/asciimoo/searx/issues'
 export SEARX_URL='https://searx.me'
 export DOCS_URL='https://asciimoo.github.io/searx'