git.iko.soy/searx
on master help sign in
build environment: add GIT_BRANCH variable

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

commit0742c2504dae04ac054d263de8a2b8ab6161312c authorMarkus Heiser <markus.heiser@darmarit.de> dateSun 29 Mar 2020, 16:28 (7 years ago) parent7b4cf2e
5 files changed+10−3
compare with master
unifiedsplit
Makefile+3 docs/conf.py+1−1 docs/dev/makefile.rst+4−2 searx/brand.py+1 utils/brand.env+1
Makefile+3
@@ -2,6 +2,7 @@
22.DEFAULT_GOAL=help
33
44export GIT_URL=https://github.com/asciimoo/searx
5+export GIT_BRANCH=master
56export SEARX_URL=https://searx.me
67export DOCS_URL=https://asciimoo.github.io/searx
78
@@ -114,12 +115,14 @@ useragents.update: pyenvinstall
114115searx.brand:
115116 $(Q)echo "build searx/brand.py"
116117 $(Q)echo "GIT_URL = '$(GIT_URL)'" > searx/brand.py
118+ $(Q)echo "GIT_BRANCH = '$(GIT_BRANCH)'" >> searx/brand.py
117119 $(Q)echo "ISSUE_URL = 'https://github.com/asciimoo/searx/issues'" >> searx/brand.py
118120 $(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py
119121 $(Q)echo "DOCS_URL = '$(DOCS_URL)'" >> searx/brand.py
120122 $(Q)echo "PUBLIC_INSTANCES = 'https://searx.space'" >> searx/brand.py
121123 $(Q)echo "build utils/brand.env"
122124 $(Q)echo "export GIT_URL='$(GIT_URL)'" > utils/brand.env
125+ $(Q)echo "export GIT_BRANCH='$(GIT_BRANCH)'" >> utils/brand.env
123126 $(Q)echo "export ISSUE_URL='https://github.com/asciimoo/searx/issues'" >> utils/brand.env
124127 $(Q)echo "export SEARX_URL='$(SEARX_URL)'" >> utils/brand.env
125128 $(Q)echo "export DOCS_URL='$(DOCS_URL)'" >> utils/brand.env
docs/conf.py+1−1
@@ -6,7 +6,7 @@ from searx.version import VERSION_STRING
66from pallets_sphinx_themes import ProjectLink
77
88from searx.brand import GIT_URL
9−GIT_BRANCH =os.environ.get("GIT_BRANCH", "master")
9+GIT_BRANCH = os.environ.get("GIT_BRANCH", "master")
1010from searx.brand import SEARX_URL
1111from searx.brand import DOCS_URL
1212
docs/dev/makefile.rst+4−2
@@ -46,9 +46,9 @@ Makefile setup
4646
4747The main setup is done in the :origin:`Makefile`::
4848
49− export SEARX_URL=https://searx.me
50−
5149 export GIT_URL=https://github.com/asciimoo/searx
50+ export GIT_BRANCH=master
51+ export SEARX_URL=https://searx.me
5252 export DOCS_URL=https://asciimoo.github.io/searx
5353
5454.. sidebar:: fork & upstream
@@ -58,6 +58,8 @@ The main setup is done in the :origin:`Makefile`::
5858
5959:GIT_URL: Changes this, to point to your searx fork.
6060
61+:GIT_BRANCH: Changes this, to point to your searx branch.
62+
6163:SEARX_URL: Changes this, to point to your searx instance.
6264
6365:DOCS_URL: If you host your own (branded) documentation, change this URL.
searx/brand.py+1
@@ -1,4 +1,5 @@
11GIT_URL = 'https://github.com/asciimoo/searx'
2+GIT_BRANCH = 'master'
23ISSUE_URL = 'https://github.com/asciimoo/searx/issues'
34SEARX_URL = 'https://searx.me'
45DOCS_URL = 'https://asciimoo.github.io/searx'
utils/brand.env+1
@@ -1,4 +1,5 @@
11export GIT_URL='https://github.com/asciimoo/searx'
2+export GIT_BRANCH='master'
23export ISSUE_URL='https://github.com/asciimoo/searx/issues'
34export SEARX_URL='https://searx.me'
45export DOCS_URL='https://asciimoo.github.io/searx'