From 177814d045c9cde4598bb516c794caead364afcd Mon Sep 17 00:00:00 2001 From: wangfei Date: Mon, 5 Dec 2022 14:01:13 +0800 Subject: [PATCH] optimize rootfs scripts --- context/rootfs/scripts/docker.sh | 1 + context/rootfs/scripts/init-kube.sh | 1 + context/rootfs/scripts/nvidia-docker.sh | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/context/rootfs/scripts/docker.sh b/context/rootfs/scripts/docker.sh index 51cc377..16a5b4e 100644 --- a/context/rootfs/scripts/docker.sh +++ b/context/rootfs/scripts/docker.sh @@ -22,6 +22,7 @@ scripts_path=$(cd `dirname "$0"`; pwd) image_dir="$scripts_path/../images" DOCKER_VERSION="19.03.14-sealer" +# shellcheck disable=SC1091 get_distribution() { lsb_dist="" # Every system that we officially support has /etc/os-release diff --git a/context/rootfs/scripts/init-kube.sh b/context/rootfs/scripts/init-kube.sh index 0886785..82c7836 100644 --- a/context/rootfs/scripts/init-kube.sh +++ b/context/rootfs/scripts/init-kube.sh @@ -3,6 +3,7 @@ # shellcheck disable=SC2046 # shellcheck disable=SC2164 # shellcheck disable=SC2006 +# shellcheck disable=SC1091 scripts_path=$(cd `dirname "$0"`; pwd) source "${scripts_path}"/utils.sh diff --git a/context/rootfs/scripts/nvidia-docker.sh b/context/rootfs/scripts/nvidia-docker.sh index 9a6d0dd..8c38792 100644 --- a/context/rootfs/scripts/nvidia-docker.sh +++ b/context/rootfs/scripts/nvidia-docker.sh @@ -7,6 +7,7 @@ # shellcheck disable=SC2006 # shellcheck disable=SC2005 # shellcheck disable=SC2181 +# shellcheck disable=SC1091 scripts_path=$(cd `dirname "$0"`; pwd) source "${scripts_path}"/utils.sh @@ -53,7 +54,7 @@ public::nvidia::enable_gpu_device_plugin() { } kube::nvidia::detect_gpu(){ - tar -xvf "${scripts_path}"/../tgz/nvidia.tgz -C ${scripts_path}/../rpm/ + tar -xvf "${scripts_path}"/../tgz/nvidia.tgz -C "${scripts_path}"/../rpm/ kube::nvidia::setup_lspci lspci | grep -i nvidia > /dev/null 2>&1 if [[ "$?" == "0" ]]; then @@ -66,7 +67,7 @@ kube::nvidia::setup_lspci(){ return fi utils_info "lspci command not exist, install it" - rpm -ivh --force --nodeps ${RPM_DIR}/pciutils*.rpm + rpm -ivh --force --nodeps "${RPM_DIR}"/pciutils*.rpm if [[ "$?" != "0" ]]; then panic "failed to install pciutils via command (rpm -ivh --force --nodeps ${RPM_DIR}/pciutils*.rpm) in dir ${PWD}, please run it for debug" fi