shellcheck: SC2069: To redirect stdout+stderr, 2>&1 must be last

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

pkg/cidata/cidata.TEMPLATE.d/boot/20-rootless-base.sh

@@ -2,7 +2,7 @@
 set -eux
 
 # This script does not work unless systemd is available
-command -v systemctl 2>&1 >/dev/null || exit 0
+command -v systemctl >/dev/null 2>&1 || exit 0
 
 # Set up env
 for f in .profile .bashrc; do

pkg/cidata/cidata.TEMPLATE.d/boot/30-install-packages.sh

@@ -11,7 +11,7 @@ update_fuse_conf(){
 }
 
 # Install minimum dependencies
-if command -v apt-get 2>&1 >/dev/null; then
+if command -v apt-get >/dev/null 2>&1; then
   DEBIAN_FRONTEND=noninteractive
   export DEBIAN_FRONTEND
   apt-get update
@@ -25,7 +25,7 @@ if command -v apt-get 2>&1 >/dev/null; then
   if [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
     apt-get install -y uidmap fuse3 dbus-user-session
   fi
-elif command -v dnf 2>&1 >/dev/null; then
+elif command -v dnf >/dev/null 2>&1; then
   if [ "${LIMA_CIDATA_MOUNTS}" -gt 0 ]; then
     dnf install -y fuse-sshfs
     update_fuse_conf
@@ -40,9 +40,9 @@ elif command -v dnf 2>&1 >/dev/null; then
       ln -s fusermount3 /usr/bin/fusermount
     fi
   fi
-elif command -v apk 2>&1 >/dev/null; then
+elif command -v apk >/dev/null 2>&1; then
   if [ "${LIMA_CIDATA_MOUNTS}" -gt 0 ]; then
-    if ! command -v sshfs 2>&1 >/dev/null; then
+    if ! command -v sshfs >/dev/null 2>&1; then
       apk update
       apk add sshfs
     fi

pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh

@@ -7,7 +7,7 @@ if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" != 1 ] && [ "${LIMA_CIDATA_CONTAINERD_US
 fi
 
 # This script does not work unless systemd is available
-command -v systemctl 2>&1 >/dev/null || exit 0
+command -v systemctl >/dev/null 2>&1 || exit 0
 
 if [ ! -x /usr/local/bin/nerdctl ]; then
   tar Cxzf /usr/local "${LIMA_CIDATA_MNT}"/nerdctl-full.tgz
@@ -42,7 +42,7 @@ EOF
   chown -R "${LIMA_CIDATA_USER}" "/home/${LIMA_CIDATA_USER}.linux/.config"
   fi
   selinux=
-  if command -v selinuxenabled 2>&1 >/dev/null && selinuxenabled; then
+  if command -v selinuxenabled >/dev/null 2>&1 && selinuxenabled; then
     selinux=1
   fi
   if [ ! -e "/home/${LIMA_CIDATA_USER}}}.linux/.config/systemd/user/containerd.service" ]; then