Browse Source

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>
Markus Heiser 5 years ago
parent
commit
f5f83b8a99
2 changed files with 4 additions and 3 deletions
  1. 2 1
      Makefile
  2. 2 2
      utils/lib.sh

+ 2 - 1
Makefile

@@ -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

+ 2 - 2
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}"