0742c25 · searx · git.iko.soy

Makefile+3

compare with master

unifiedsplit

@@ -2,6 +2,7 @@

2.DEFAULT_GOAL=help

3

4export GIT_URL=https://github.com/asciimoo/searx

5+export GIT_BRANCH=master

5export SEARX_URL=https://searx.me

6export SEARX_URL=https://searx.me

6export DOCS_URL=https://asciimoo.github.io/searx

7export DOCS_URL=https://asciimoo.github.io/searx

7

8

@@ -114,12 +115,14 @@ useragents.update: pyenvinstall

114searx.brand:

115searx.brand:

115 $(Q)echo "build searx/brand.py"

116 $(Q)echo "build searx/brand.py"

116 $(Q)echo "GIT_URL = '$(GIT_URL)'" > searx/brand.py

117 $(Q)echo "GIT_URL = '$(GIT_URL)'" > searx/brand.py

118+ $(Q)echo "GIT_BRANCH = '$(GIT_BRANCH)'" >> searx/brand.py

117 $(Q)echo "ISSUE_URL = 'https://github.com/asciimoo/searx/issues'" >> searx/brand.py

119 $(Q)echo "ISSUE_URL = 'https://github.com/asciimoo/searx/issues'" >> searx/brand.py

118 $(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py

120 $(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py

119 $(Q)echo "DOCS_URL = '$(DOCS_URL)'" >> searx/brand.py

121 $(Q)echo "DOCS_URL = '$(DOCS_URL)'" >> searx/brand.py

120 $(Q)echo "PUBLIC_INSTANCES = 'https://searx.space'" >> searx/brand.py

122 $(Q)echo "PUBLIC_INSTANCES = 'https://searx.space'" >> searx/brand.py

121 $(Q)echo "build utils/brand.env"

123 $(Q)echo "build utils/brand.env"

122 $(Q)echo "export GIT_URL='$(GIT_URL)'" > utils/brand.env

124 $(Q)echo "export GIT_URL='$(GIT_URL)'" > utils/brand.env

125+ $(Q)echo "export GIT_BRANCH='$(GIT_BRANCH)'" >> utils/brand.env

123 $(Q)echo "export ISSUE_URL='https://github.com/asciimoo/searx/issues'" >> utils/brand.env

126 $(Q)echo "export ISSUE_URL='https://github.com/asciimoo/searx/issues'" >> utils/brand.env

124 $(Q)echo "export SEARX_URL='$(SEARX_URL)'" >> utils/brand.env

127 $(Q)echo "export SEARX_URL='$(SEARX_URL)'" >> utils/brand.env

125 $(Q)echo "export DOCS_URL='$(DOCS_URL)'" >> utils/brand.env

128 $(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

6from pallets_sphinx_themes import ProjectLink

7

8from searx.brand import GIT_URL

9−GIT_BRANCH =os.environ.get("GIT_BRANCH", "master")

9+GIT_BRANCH = os.environ.get("GIT_BRANCH", "master")

10from searx.brand import SEARX_URL

11from searx.brand import DOCS_URL

12

docs/dev/makefile.rst+4−2

@@ -46,9 +46,9 @@ Makefile setup

46

47The main setup is done in the :origin:`Makefile`::

48

49− export SEARX_URL=https://searx.me

50−

51 export GIT_URL=https://github.com/asciimoo/searx

49 export GIT_URL=https://github.com/asciimoo/searx

50+ export GIT_BRANCH=master

51+ export SEARX_URL=https://searx.me

52 export DOCS_URL=https://asciimoo.github.io/searx

53

54.. sidebar:: fork & upstream

@@ -58,6 +58,8 @@ The main setup is done in the :origin:`Makefile`::

58

59:GIT_URL: Changes this, to point to your searx fork.

60

61+:GIT_BRANCH: Changes this, to point to your searx branch.

62+

61:SEARX_URL: Changes this, to point to your searx instance.

63:SEARX_URL: Changes this, to point to your searx instance.

62

64

63:DOCS_URL: If you host your own (branded) documentation, change this URL.

65:DOCS_URL: If you host your own (branded) documentation, change this URL.

searx/brand.py+1

@@ -1,4 +1,5 @@

1GIT_URL = 'https://github.com/asciimoo/searx'

2+GIT_BRANCH = 'master'

2ISSUE_URL = 'https://github.com/asciimoo/searx/issues'

3ISSUE_URL = 'https://github.com/asciimoo/searx/issues'

3SEARX_URL = 'https://searx.me'

4SEARX_URL = 'https://searx.me'

4DOCS_URL = 'https://asciimoo.github.io/searx'

5DOCS_URL = 'https://asciimoo.github.io/searx'

utils/brand.env+1

@@ -1,4 +1,5 @@

1export GIT_URL='https://github.com/asciimoo/searx'

2+export GIT_BRANCH='master'

2export ISSUE_URL='https://github.com/asciimoo/searx/issues'

3export ISSUE_URL='https://github.com/asciimoo/searx/issues'

3export SEARX_URL='https://searx.me'

4export SEARX_URL='https://searx.me'

4export DOCS_URL='https://asciimoo.github.io/searx'

5export DOCS_URL='https://asciimoo.github.io/searx'