script: make -x option optional in scripts

Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
kuasar-io · Feb 1, 2024 · b9ccea8 · b9ccea8
1 parent d8f98cd
commit b9ccea8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -23,15 +23,15 @@ bin/vmm-task:
 	@mkdir -p bin && cp vmm/task/target/${ARCH}-unknown-linux-musl/release/vmm-task bin/vmm-task
 
 bin/vmlinux.bin:
-	@bash -x vmm/scripts/kernel/${HYPERVISOR}/build.sh ${KERNEL_VERSION}
+	@bash vmm/scripts/kernel/${HYPERVISOR}/build.sh ${KERNEL_VERSION}
 	@mkdir -p bin && cp vmm/scripts/kernel/${HYPERVISOR}/vmlinux.bin bin/vmlinux.bin && rm vmm/scripts/kernel/${HYPERVISOR}/vmlinux.bin
 
 bin/kuasar.img:
-	@bash -x vmm/scripts/image/${GUESTOS_IMAGE}/build.sh image
+	@bash vmm/scripts/image/${GUESTOS_IMAGE}/build.sh image
 	@mkdir -p bin && cp /tmp/kuasar.img bin/kuasar.img && rm /tmp/kuasar.img
 
 bin/kuasar.initrd:
-	@bash -x vmm/scripts/image/${GUESTOS_IMAGE}/build.sh initrd
+	@bash vmm/scripts/image/${GUESTOS_IMAGE}/build.sh initrd
 	@mkdir -p bin && cp /tmp/kuasar.initrd bin/kuasar.initrd && rm /tmp/kuasar.initrd
 
 bin/wasm-sandboxer:

diff --git a/vmm/scripts/image/centos/build.sh b/vmm/scripts/image/centos/build.sh
@@ -68,7 +68,7 @@ containerd)
 		--mount type=bind,src="${ROOTFS_DIR}",dst=/tmp/kuasar-rootfs,options=rbind:rw \
 		${IMAGE_NAME} \
 		${container_name} \
-		bash -x /kuasar/vmm/scripts/image/centos/build_rootfs.sh
+		bash /kuasar/vmm/scripts/image/centos/build_rootfs.sh
 	fn_check_result $? "ctr run ${container_name} return error!"
 	;;
 docker)
@@ -80,7 +80,7 @@ docker)
 		-v "${REPO_DIR}":/kuasar \
 		-v "${ROOTFS_DIR}":"/tmp/kuasar-rootfs" \
 		${IMAGE_NAME} \
-		bash -x /kuasar/vmm/scripts/image/centos/build_rootfs.sh
+		bash /kuasar/vmm/scripts/image/centos/build_rootfs.sh
 	fn_check_result $? "docker run ${container_name} return error!"
 	;;
 isulad)
@@ -93,7 +93,7 @@ isulad)
 		-v "${REPO_DIR}":/kuasar \
 		-v "${ROOTFS_DIR}":"/tmp/kuasar-rootfs" \
 		${IMAGE_NAME} \
-		bash -x /kuasar/vmm/scripts/image/centos/build_rootfs.sh
+		bash /kuasar/vmm/scripts/image/centos/build_rootfs.sh
 	fn_check_result $? "isula run ${container_name} return error!"
 	;;
 *)
@@ -109,7 +109,7 @@ fi
 
 case "$1" in
 image)
-	bash -x ${REPO_DIR}/vmm/scripts/image/build_image.sh
+	bash ${REPO_DIR}/vmm/scripts/image/build_image.sh
 	fn_check_result $? "build image failed!"
 	;;
 initrd)

diff --git a/vmm/scripts/image/centos/build_rootfs.sh b/vmm/scripts/image/centos/build_rootfs.sh
@@ -15,6 +15,8 @@
 
 set -e
 
+[ -n "${DEBUG}" ] && set -x
+
 golang_version="1.20.5"
 cert_file_path="/kuasar/proxy.crt"
 ARCH=$(uname -m)