ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

shellcheck: minor fixes to support all dsitros 

checked with::

  sudo ./utils/lxc.sh cmd -- make test.sh

on ubu1804, ubu1910, fedora31 and archlinux.  All checks OK except:

ubu1604: uses shellcheck v0.3.7 (from 04/2015) which is no longer supported!

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2020-03-08 18:37:16 +01:00
parent 04ad648105
commit f5f83b8a99
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8; mode: makefile-gmake -*- # -*- coding: utf-8; mode: makefile-gmake -*-
.DEFAULT_GOAL=help
include ./.config.mk include ./.config.mk
PYOBJECTS = searx PYOBJECTS = searx
@ -104,6 +104,7 @@ test.pylint: pyenvinstall
$(call cmd,pylint,searx/preferences.py) $(call cmd,pylint,searx/preferences.py)
$(call cmd,pylint,searx/testing.py) $(call cmd,pylint,searx/testing.py)
# ubu1604: uses shellcheck v0.3.7 (from 04/2015), no longer supported!
test.sh: test.sh:
shellcheck -x utils/lib.sh shellcheck -x utils/lib.sh
shellcheck -x utils/filtron.sh shellcheck -x utils/filtron.sh

4
utils/lib.sh
View File

@ -4,9 +4,9 @@
# shellcheck disable=SC2059,SC1117 # shellcheck disable=SC2059,SC1117
# ubuntu, debian, arch, fedora ... # ubuntu, debian, arch, fedora ...
DIST_ID=$(source /etc/os-release; echo $ID); DIST_ID=$(source /etc/os-release; echo "$ID");
# shellcheck disable=SC2034 # shellcheck disable=SC2034
DIST_VERS=$(source /etc/os-release; echo $VERSION_ID); DIST_VERS=$(source /etc/os-release; echo "$VERSION_ID");
ADMIN_NAME="${ADMIN_NAME:-$(git config user.name)}" ADMIN_NAME="${ADMIN_NAME:-$(git config user.name)}"
ADMIN_NAME="${ADMIN_NAME:-$USER}" ADMIN_NAME="${ADMIN_NAME:-$USER}"