From 9cae43304a517975e4b968a26746475e80196bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E5=8D=9A=E4=BB=81?= Date: Tue, 13 Jun 2017 21:21:30 +0800 Subject: [PATCH] src/woeusb: chk_rt_deps: Fix mkfs.fat detection, fixes #106 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch fixed two issues: * `mkfs.msdos` detection is not working due to typo * `mkfs.vfat` and `mkfs.fat` not detected, which the latter is used by current dosfstools ``` The ./configure script has an option --enable-compat-symlinks that will configure the build to symlink older names of the tools to the current ones on installation. These are dosfsck, fsck.msdos and fsck.vfat for fsck.fat, mkdosfs, mkfs.msdos and mkfs.vfat for mkfs.fat and dosfslabel for fatlabel ``` Reported-by: Jens(schiffsratte) Related-GitHub-Issue: make compatible with dosfstools 4 · Issue #106 · slacka/WoeUSB Signed-off-by: 林博仁 --- src/woeusb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/woeusb b/src/woeusb index 8ba2972..dd83ff6 100755 --- a/src/woeusb +++ b/src/woeusb @@ -370,11 +370,15 @@ check_runtime_dependencies(){ if command -v 'mkdosfs' &> /dev/null; then command_mkdosfs_ref='mkdosfs' - elif command -v 'make.msdos' &> /dev/null; then + elif command -v 'mkfs.msdos' &> /dev/null; then command_mkdosfs_ref='mkfs.msdos' + elif command -v 'mkfs.vfat' &>/dev/null; then + command_mkdosfs_ref='mkfs.vfat' + elif command -v 'mkfs.fat' &>/dev/null; then + command_mkdosfs_ref='mkfs.fat' else echo_with_color red\ - "${FUNCNAME[0]}: Error: mkdosfs or mkfs.msdos command not found!" >&2 + "${FUNCNAME[0]}: Error: mkdosfs/mkfs.msdos/mkfs.vfat/mkfs.fat command not found!" >&2 echo_with_color red\ "${FUNCNAME[0]}: Error: Please make sure that dosfstools is properly installed!" >&2 result="failed"