diff options
| -rwxr-xr-x | include/blobutil.sh | 18 | ||||
| -rwxr-xr-x | script/update/blobs/download | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/include/blobutil.sh b/include/blobutil.sh index a14f92c1..873d368d 100755 --- a/include/blobutil.sh +++ b/include/blobutil.sh @@ -96,3 +96,21 @@ vendor_checksum() return 1 fi } + +mkdirs() +{ + [ -f "${1}" ] && \ + printf "mkdirs ${1} ${2}: already downloaded\n" 1>&2 && return 1 + mkdir -p "${1%/*}" || err "mkdirs ${1} ${2}: !mkdir ${1%/*}" + rm -Rf "${appdir}" || err "mkdirs ${1} ${2}: can't remove ${appdir}" + mkdir -p "${appdir}/" || err "mkdirs ${1} ${2}: !mkdir ${appdir}" + extract_archive "${_dl}" "${appdir}" || \ + [ "${2}" = "extract_e6400vga" ] || err "mkdirs ${1} ${2}: !extract" +} + +extract_archive() +{ + innoextract "${1}" -d "${2}" || python "${pfs_extract}" "${1}" -e || \ + 7z x "${1}" -o"${2}" || unar "${1}" -o "${2}" || \ + unzip "${1}" -d "${2}" || return 1 +} diff --git a/script/update/blobs/download b/script/update/blobs/download index 5c832c5f..2ccf3b77 100755 --- a/script/update/blobs/download +++ b/script/update/blobs/download @@ -186,22 +186,4 @@ extract_sch5545ec() err "extract_sch5545ec: cannot copy sch5545ec firmware file" } -mkdirs() -{ - [ -f "${1}" ] && \ - printf "mkdirs ${1} ${2}: already downloaded\n" 1>&2 && return 1 - mkdir -p "${1%/*}" || err "mkdirs ${1} ${2}: !mkdir ${1%/*}" - rm -Rf "${appdir}" || err "mkdirs ${1} ${2}: can't remove ${appdir}" - mkdir -p "${appdir}/" || err "mkdirs ${1} ${2}: !mkdir ${appdir}" - extract_archive "${_dl}" "${appdir}" || \ - [ "${2}" = "extract_e6400vga" ] || err "mkdirs ${1} ${2}: !extract" -} - -extract_archive() -{ - innoextract "${1}" -d "${2}" || python "${pfs_extract}" "${1}" -e || \ - 7z x "${1}" -o"${2}" || unar "${1}" -o "${2}" || \ - unzip "${1}" -d "${2}" || return 1 -} - main $@ |