| Age | Commit message (Collapse) | Author |
|
- use single quote in the STATIC_BUILT_PATHS to avoid bash globbing
- don't try to commit if no files have been changed
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
* move `searx/static/themes/simple/img/searxng.svg` to `src/brand/searxng.svg`
* README.rst can use it without a reference to a theme.
* the simple theme can create `searx/static/themes/simple/img/searxng.png` using
the svg2png task
Suggested-by: @dalf https://github.com/searxng/searxng/pull/561#issuecomment-981747902
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
If the fetched branch has been rebased a 'git pull' will fails. To get fetched
branch in the working tree, a git reset is needed.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
[mod] filtron.sh - install github.com/searxng/filtron
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
SearXNG maintains a fork of filtron at [1]
[1] https://github.com/searxng/filtron
Related: https://github.com/searxng/searxng/issues/507#issuecomment-970254027
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
The Node.js installation in the NVM environment can be used by IDEs and other
developer tasks. The required developer packagaes are added to the file
./.nvm_packages and will be installed when Node.js is installed. Initial we
start with:
- eslint
Having a dedicated developer enviroment, provided by nvm makes it easy to
integrate Node.js packages into various IDEs. One example is shown in the
.dir-locals.el which is used by emacs.
[1] https://github.com/nvm-sh/nvm#default-global-packages-from-file-while-installing
[2] https://eslint.org
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Issue::
$ make clean node.env
...
CLEAN [NVM] drop .nvm/
...
INFO: install Node.js by NVM
...
Now using node v16.13.0 (npm v8.1.0)
...
INSTALL searx/static/themes/oscar/package.json
npm ERR! code ENOENT
npm ERR! syscall open
# Here now comes the issue, caused by the missing 'popd' ..
npm ERR! path SearXNG/.nvm/searx/static/themes/oscar/package.json
npm ERR! errno -2
npm ERR! enoent ENOENT: no such file or directory, open 'SearXNG/.nvm/searx/static/themes/oscar/package.json'
ERROR: node.env exit with error (254)
make: *** [Makefile:99: node.env] Error 254
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
In commit e82e37ce6 accidentally the brand file was touched / partial
revert::
export GIT_URL='https://github.com/searxng/searxng'
export GIT_BRANCH='master'
Related: https://github.com/searxng/searxng/pull/515
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Issue was::
$ LANG=C make nvm.clean
INFO: NVM is not installed
make: *** [Makefile:99: nvm.clean] Error 42
Now::
$ LANG=C make nvm.clean
CLEAN [NVM] not installed
BTW: change info_msg to build_msg
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Various modification of the documentation and the theme sphinx-theme
|
|
[mod] Tools to install and maintain golang binaries & packages.
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
[1] https://github.com/nvm-sh/nvm
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Closes: https://github.com/searxng/searxng/issues/507
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
[1] https://golang.org/doc/devel/release#policy
A simple *helloworld* test with user 'my_user' :
sudo -H adduser my_user
./manage go.golang go1.17.3 my_user
./manage go.install github.com/go-training/helloworld@latest my_user
./manage go.bash my_user
$ helloword
Hello World!!
Don't forget to remove 'my_user': sudo -H deluser --remove-home my_user
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
* update from ionicons-npm to ionicons ver.5
* drop the webfont built by grunt for icons
* built icons.html template for inlining icons with jinja2 into html
* update icon to use mostly the outline version
* add icons to categories and do not display them on mobile to save space
* remove all legacy ion icon font files from simple theme
* icons.html is added in this commit since make statc.build.restore requires git to know the file already
* cleanup error-dialog
|
|
new bash function convert_if_newer() / usage::
convert_if_newer <origfile> <outfile> [<options>, ...]
convert_if_newer "path/to/origin.svg" "path/to/converted.png" -transparent white -resize 64x64
Run's ImageMagik' convert comand to generate <outfile> from <origfile>, if
<origfile> is newer than <outfile>. The command line is to convert is::
convert <origfile> [<options>, ...] <outfile>
PNG 'searx/static/themes/simple/img/favicon.png' has been created by::
$ make themes.simple
CONVERT searx/static/themes/simple/src/svg/searxng-wordmark.svg -transparent white -resize 64x64 searx/static/themes/simple/img/favicon.png
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Command::
./node_modules/.bin/html-minifier \
--remove-comments \
--collapse-whitespace \
src/svg/searxng-wordmark.svg \
-o ../../../templates/__common__/searxng-wordmark.min.svg
- html-minifier: https://github.com/kangax/html-minifier
- onilne: https://kangax.github.io/html-minifier
- grunt: https://www.npmjs.com/package/grunt-contrib-htmlmin
- grunt-contrib-htmlmin: https://github.com/gruntjs/grunt-contrib-htmlmin
- npm: https://www.npmjs.com/package/html-minifier
To test, rebuild your node environment::
make node.env
Alternatives:
- pretty-data: https://github.com/vkiryukhin/pretty-data
- grunt: https://www.npmjs.com/package/grunt-xmlmin
- grunt-xmlming: https://github.com/dtrunk90/grunt-xmlmin
- npm: https://www.npmjs.com/package/grunt-xmlmin
- minify-xml: https://github.com/kristian/minify-xml
- no grunt package available
- npm: https://www.npmjs.com/package/minify-xml
src/svg/searxng-wordmark.svg':
'../../../templates/__common__/searxng-wordmark.min.svg'
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
When golang is installed via a package manager the local version, which filtron
downloads, is ignored.
BTW: With the new go1.17.2 (cfea51f4), 'go get' is depricated::
go get: installing executables with 'go get' in module mode is deprecated.
Use 'go install pkg@version' instead.
For more information, see https://golang.org/doc/go-get-install-deprecation
or run 'go help get' or 'go help install'.
Reported-by: @tiekoetter https://github.com/searxng/searxng/pull/455#issuecomment-954918411
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Related-to: 5c4afdd7 https://github.com/searxng/searxng/issues/455
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Impplement a script to check a morty installation::
./utils/morty.sh install check
Related-to: https://github.com/searxng/searxng/issues/450
Related-to: https://github.com/searxng/searxng/pull/446#issuecomment-954599668
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Related-to: 5c4afdd7 https://github.com/searxng/searxng/issues/455
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Impplement a script to check a filtron installation::
./utils/filtron.sh install check
Related-to: https://github.com/searxng/searxng/issues/450
Related-to: https://github.com/searxng/searxng/pull/446#issuecomment-954599668
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Impplement a script to check a SearXNG installation::
./utils/searx.sh install check
Related-to: https://github.com/searxng/searxng/issues/450
Related-to: https://github.com/searxng/searxng/pull/446#issuecomment-954599668
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
morty & filtron upgrade golang from v1.13.5 to v1.17.2 (#stable go[1])
Closes: #443
[1] https://golang.org/dl/#stable
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
|
|
|
|
|
|
|
|
* initialize virtualenv (pyenv.install)
* activate virtualenv
close #310
|
|
|
|
The settings template in utils/templates/etc/searx/settings.yml
does not include any replacements (shell environment variables).
BTW: utils/filtron.sh & utils/lib.sh
Add some more messages to installation procedures, to be more clear.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
|
|
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Fix the quotation marks in the command line to run
python -m searx.version
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
The first import of names from the searx package implies loading the
settings.yml. Before this is done, the enviroment variables must be unset to
not overwrite the values from the settings.yml
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
This commit remove the need to update the brand for GIT_URL and GIT_BRANCH:
there are read from the git repository.
It is possible to call python -m searx.version freeze to freeze the current version.
Useful when the code is installed outside git (distro package, docker, etc...)
|
|
This reverts commit e946c3462c2b44fb154d0b6595f4f42605a326e5.
|
|
Do not merge this patch in master branch of SearXNG! This branch exists only
for testing the feature branch fix-searx.sh @return42.
This patch changes the buildenv to::
GIT_URL='https://github.com/return42/searxng'
GIT_BRANCH='fix-searx.sh'
SEARX_PORT='7777'
SEARX_BIND_ADDRESS='127.0.0.12'
To test installation procedure, clone feature branch (fix-searx.sh)::
$ cd ~/Downloads
$ git clone --branch fix-searx.sh https://github.com/return42/searxng searxng
$ cd searxng
$ ./utils/searx.sh install all
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
The filtron target is the SearXNG installation and the default of FILTRON_TARGET
is taken from the YAML configuration ('server.port' & 'server.bind_address').
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|
|
Some defaults in the settings.yml are taken from the environment.
By example;
The manage scripts sources the ./utils/brand.env and sets SEARX_PORT
environment. This enviroment *wins over* any settings in a YAML file.
Whe we run a::
make test.robot
The searx/settings_robot.yml is used, in this file the server settings are::
server:
port: 11111
bind_address: 127.0.0.1
To get in use of the 'port: 11111' we have to unset the SEARX_PORT environment
which was sourced before.
The function buildenv.unset_env() can be called in all use cases where the
enviroment from ./utils/brand.env is not wanted. ATM it unset the enviroment
variables::
unset GIT_URL
unset GIT_BRANCH
unset SEARX_URL
unset SEARX_PORT
unset SEARX_BIND_ADDRESS
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
|