diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2020-03-08 18:37:16 +0100 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2020-03-08 18:37:16 +0100 |
| commit | f5f83b8a99a45198822f4e382575d3147e652e56 (patch) | |
| tree | 21fb87a1dbd7e0f3097ccc4f5f236b168343d9e4 | |
| parent | 04ad648105a65a27a0654204a461775d178b49ce (diff) | |
| download | searxng-f5f83b8a99a45198822f4e382575d3147e652e56.tar.gz searxng-f5f83b8a99a45198822f4e382575d3147e652e56.zip | |
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>
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | utils/lib.sh | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -1,5 +1,5 @@ # -*- coding: utf-8; mode: makefile-gmake -*- - +.DEFAULT_GOAL=help include ./.config.mk PYOBJECTS = searx @@ -104,6 +104,7 @@ test.pylint: pyenvinstall $(call cmd,pylint,searx/preferences.py) $(call cmd,pylint,searx/testing.py) +# ubu1604: uses shellcheck v0.3.7 (from 04/2015), no longer supported! test.sh: shellcheck -x utils/lib.sh shellcheck -x utils/filtron.sh diff --git a/utils/lib.sh b/utils/lib.sh index 26a26d750..e13acca3e 100755 --- a/utils/lib.sh +++ b/utils/lib.sh @@ -4,9 +4,9 @@ # shellcheck disable=SC2059,SC1117 # ubuntu, debian, arch, fedora ... -DIST_ID=$(source /etc/os-release; echo $ID); +DIST_ID=$(source /etc/os-release; echo "$ID"); # 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:-$USER}" |