From c42d817bd48fb996a8187731fb37890a3e59fcda Mon Sep 17 00:00:00 2001 From: Kroese Date: Wed, 12 Jun 2024 22:15:47 +0200 Subject: [PATCH] Update install.sh --- src/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/install.sh b/src/install.sh index d91f9d8..bf98147 100644 --- a/src/install.sh +++ b/src/install.sh @@ -13,7 +13,7 @@ detectType() { *".iso" ) BOOT="$file" - [ -n "${BOOT_MODE:-}" ] && break + [ -n "${BOOT_MODE:-}" ] && return 0 # Automaticly detect UEFI-compatible ISO's dir=$(isoinfo -f -i "$file") @@ -27,7 +27,7 @@ detectType() { DISK_NAME=$(basename "$file") DISK_NAME="${DISK_NAME%.*}" - [ -n "${BOOT_MODE:-}" ] && break + [ -n "${BOOT_MODE:-}" ] && return 0 # Automaticly detect UEFI-compatible images dir=$(sfdisk -l "$file") @@ -41,7 +41,7 @@ detectType() { DISK_NAME=$(basename "$file") DISK_NAME="${DISK_NAME%.*}" - [ -n "${BOOT_MODE:-}" ] && break + [ -n "${BOOT_MODE:-}" ] && return 0 # TODO: Detect boot mode from partition table in image BOOT_MODE="uefi" @@ -105,7 +105,7 @@ convertImage() { local source_fmt=$2 local dst_file=$3 local dst_fmt=$4 - local base fs fa cur_size src_size space disk_param + local dir base fs fa cur_size src_size space disk_param [ -f "$dst_file" ] && error "Conversion failed, destination file $dst_file already exists?" && return 1 [ ! -f "$source_file" ] && error "Conversion failed, source file $source_file does not exists?" && return 1 @@ -116,7 +116,7 @@ convertImage() { fi local tmp_file="$dst_file.tmp" - local dir=$(dirname "$tmp_file") + dir=$(dirname "$tmp_file") rm -f "$tmp_file"