summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--searx/settings.yml21
-rwxr-xr-xutils/lib.sh17
-rwxr-xr-xutils/lxc.sh4
4 files changed, 39 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index ea743dd35..2b9dfacce 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,9 @@ clean: py.clean docs.clean node.clean test.clean
$(Q)find . -name '*~' -exec rm -f {} +
$(Q)find . -name '*.bak' -exec rm -f {} +
+lxc.clean:
+ $(Q)rm -rf lxc-env
+
PHONY += search.checker search.checker.%
search.checker: install
$(Q)./manage pyenv.cmd searx-checker -v
diff --git a/searx/settings.yml b/searx/settings.yml
index 4347ab78e..88e87b98f 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -1379,6 +1379,27 @@ engines:
require_api_key: false
results: HTML
+ - name: whaleslide
+ shortcut: whale
+ engine: json_engine
+ paging: true
+ # This API Token is needed to work
+ search_url: https://search.whaleslide.com/api/v1/search_v2/web/{pageno}?q={query}&api_token=f8OhUDEYKUICHDnIxEgI7Cb4uYyTBqT4nO8iueNbfTO3devS24yElGqM7nCm
+ url_query: url
+ title_query: title
+ title_html_to_text: true
+ content_query: abstract
+ content_html_to_text: true
+ categories: general
+ disabled: true
+ about:
+ website: https://whaleslide.com/
+ wikidata_id: # No Wikidata page
+ official_api_documentation: false
+ use_official_api: false
+ require_api_key: false
+ results: JSON
+
- name: naver
shortcut: nvr
engine: xpath
diff --git a/utils/lib.sh b/utils/lib.sh
index b75e3376b..014d4a740 100755
--- a/utils/lib.sh
+++ b/utils/lib.sh
@@ -78,9 +78,18 @@ required_commands() {
# shellcheck disable=SC2034
set_terminal_colors() {
- _colors=8
+ # https://en.wikipedia.org/wiki/ANSI_escape_code
+
+ # CSI (Control Sequence Introducer) sequences
+ _show_cursor='\e[?25h'
+ _hide_cursor='\e[?25l'
+
+ # SGR (Select Graphic Rendition) parameters
_creset='\e[0m' # reset all attributes
+ # original specification only had 8 colors
+ _colors=8
+
_Black='\e[0;30m'
_White='\e[1;37m'
_Red='\e[0;31m'
@@ -271,7 +280,7 @@ prefix_stdout () {
echo -e "${prefix}$line"
done)
# some piped commands hide the cursor, show cursory when the stream ends
- echo -en "\e[?25h"
+ echo -en "$_show_cursor"
}
append_line() {
@@ -1548,7 +1557,7 @@ pkg_install() {
;;
arch)
# shellcheck disable=SC2068
- pacman -Sy --noconfirm $@
+ pacman --noprogressbar -Sy --noconfirm $@
;;
fedora)
# shellcheck disable=SC2068
@@ -1580,7 +1589,7 @@ pkg_remove() {
;;
arch)
# shellcheck disable=SC2068
- pacman -R --noconfirm $@
+ pacman --noprogressbar -R --noconfirm $@
;;
fedora)
# shellcheck disable=SC2068
diff --git a/utils/lxc.sh b/utils/lxc.sh
index 90c4949a6..f94e9841a 100755
--- a/utils/lxc.sh
+++ b/utils/lxc.sh
@@ -45,8 +45,8 @@ ubu2010_boilerplate="$ubu1904_boilerplate"
# shellcheck disable=SC2034
archlinux_boilerplate="
-pacman -Syu --noconfirm
-pacman -S --noconfirm inetutils git curl wget sudo
+pacman --noprogressbar -Syu --noconfirm
+pacman --noprogressbar -S --noconfirm inetutils git curl wget sudo
echo 'Set disable_coredump false' >> /etc/sudo.conf
"