From c9df776f0f4c687248767391590edabdbc006020 Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Tue, 14 May 2019 09:35:08 +0200 Subject: [PATCH] x230: rename check_x230_root to force_x230_and_root --- x230/functions.sh | 2 +- x230/x230_before_first_install.sh | 2 +- x230/x230_heads.sh | 2 +- x230/x230_skulls.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x230/functions.sh b/x230/functions.sh index 1f167f1..eeba903 100755 --- a/x230/functions.sh +++ b/x230/functions.sh @@ -6,7 +6,7 @@ GREEN='\033[0;32m' YELLOW='\033[0;33m' NC='\033[0m' -check_x230_root() +force_x230_and_root() { command -v dmidecode >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install dmidecode and run as root.${NC}"; exit 1; } diff --git a/x230/x230_before_first_install.sh b/x230/x230_before_first_install.sh index f28194c..dda7c8e 100755 --- a/x230/x230_before_first_install.sh +++ b/x230/x230_before_first_install.sh @@ -45,7 +45,7 @@ do shift done -check_x230_root +force_x230_and_root BIOS_VENDOR=$(dmidecode -t bios | grep Vendor | cut -d':' -f2) if [[ $BIOS_VENDOR = *"coreboot"* ]] ; then diff --git a/x230/x230_heads.sh b/x230/x230_heads.sh index 52894a8..89b7a63 100755 --- a/x230/x230_heads.sh +++ b/x230/x230_heads.sh @@ -56,7 +56,7 @@ do shift done -check_x230_root +force_x230_and_root if [ ! "$have_input_image" -gt 0 ] ; then image_available=$(ls -1 | grep rom || true) diff --git a/x230/x230_skulls.sh b/x230/x230_skulls.sh index da0b537..f1598e5 100755 --- a/x230/x230_skulls.sh +++ b/x230/x230_skulls.sh @@ -54,7 +54,7 @@ do shift done -check_x230_root +force_x230_and_root if [ ! "$have_input_image" -gt 0 ] ; then image_available=$(ls -1 | grep x230_coreboot_seabios || true)