Skip to content

Commit

Permalink
src/woeusb: chk_rt_deps: Fix mkfs.fat detection, fixes #106
Browse files Browse the repository at this point in the history
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) <https://github.com/schiffsratte>
Related-GitHub-Issue: make compatible with dosfstools 4 · Issue #106 · slacka/WoeUSB <https://github.com/slacka/WoeUSB/issues/106>
Signed-off-by: 林博仁 <[email protected]>
  • Loading branch information
brlin-tw committed Jun 13, 2017
1 parent 70a0d65 commit 9cae433
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/woeusb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 9cae433

Please sign in to comment.