Skip to content

Commit

Permalink
Merge pull request #277 from thaJeztah/rootless_linting
Browse files Browse the repository at this point in the history
rootless-install.sh: fix some shellcheck warnings
  • Loading branch information
thaJeztah authored Mar 24, 2022
2 parents 9809a3d + 47b693c commit 0225270
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions rootless-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ dnf install -y iptables"
fi

# ip_tables module dependency check
if [ -z "$SKIP_IPTABLES" ] && ! lsmod | grep ip_tables >/dev/null 2>&1 && ! cat /lib/modules/$(uname -r)/modules.builtin | grep ip_tables >/dev/null 2>&1; then
if [ -z "$SKIP_IPTABLES" ] && ! lsmod | grep ip_tables >/dev/null 2>&1 && ! grep -q ip_tables "/lib/modules/$(uname -r)/modules.builtin"; then
INSTRUCTIONS="${INSTRUCTIONS}
modprobe ip_tables"
fi
Expand Down Expand Up @@ -225,11 +225,13 @@ exec_setuptool() {
}

do_install() {
echo "# Executing docker rootless install script, commit: $SCRIPT_COMMIT_SHA"

init_vars
checks

tmp=$(mktemp -d)
trap "rm -rf $tmp" EXIT INT TERM
trap 'rm -rf "$tmp"' EXIT INT TERM
# Download tarballs docker-* and docker-rootless-extras=*
(
cd "$tmp"
Expand Down

0 comments on commit 0225270

Please sign in to comment.