diff --git a/blobutil b/blobutil deleted file mode 100755 index 2a14bb0..0000000 --- a/blobutil +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# SPDX-FileCopyrightText: 2022 Caleb La Grange -# SPDX-FileCopyrightText: 2023 Leah Rowe -# SPDX-License-Identifier: GPL-3.0-only - -script_dir="resources/scripts/blobs" -modes=$(ls -1 ${script_dir}) - -main() -{ - if [ $# -lt 1 ]; then - printf "%s: Error: you must specify a mode\n" $0 - usage - exit 1 - fi - - ./.gitcheck - - mode=${1} - shift - args=$@ - - if [ ! -f "${script_dir}/${mode}" ]; then - printf "Error: No mode ${mode}\n" - usage - exit 1 - fi - - ./${script_dir}/${mode} ${args} || exit 1 - - ./.gitcheck clean -} - -usage(){ - cat <<- EOF - Usage: ./blobutil [mode] - Example: ./blobutil download x230_12mb - - Possible options for mode are - ${modes} - - Mode descriptions: - download: Try to automatically generate blobs for specified board - inject: Inject blobs for specified board into specified rom - extract: Extract blobs from specified rom for specified board - EOF -} - -main $@ diff --git a/blobutil b/blobutil new file mode 120000 index 0000000..012b4ec --- /dev/null +++ b/blobutil @@ -0,0 +1 @@ +lbmk \ No newline at end of file diff --git a/lbmk b/lbmk index 16f479c..e86190e 100755 --- a/lbmk +++ b/lbmk @@ -34,7 +34,11 @@ main() if [ "${0##*/}" = "lbmk" ]; then die "Do not run the lbmk script directly!" elif [ "${0##*/}" = "download" ]; then - ./update module $@ + ./update module $@ || exit 1 + exit 0 + elif [ "${0##*/}" = "blobutil" ]; then + ./update blobs $@ || exit 1 + exit 0 elif [ $# -lt 2 ]; then die "Too few arguments. Try: ${0} help" fi diff --git a/resources/scripts/blobs/download b/resources/scripts/update/blobs/download similarity index 100% rename from resources/scripts/blobs/download rename to resources/scripts/update/blobs/download diff --git a/resources/scripts/blobs/extract b/resources/scripts/update/blobs/extract similarity index 100% rename from resources/scripts/blobs/extract rename to resources/scripts/update/blobs/extract diff --git a/resources/scripts/blobs/inject b/resources/scripts/update/blobs/inject similarity index 100% rename from resources/scripts/blobs/inject rename to resources/scripts/update/blobs/inject