diff --git a/download b/download deleted file mode 100755 index e2dbfc9..0000000 --- a/download +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env bash - -# Generic script for downloading programs used by the build system -# -# Copyright (C) 2014,2015,2020,2021,2023 Leah Rowe -# Copyright (C) 2015 Patrick "P. J." McDermott -# Copyright (C) 2015, 2016 Klemens Nanni -# Copyright (C) 2022 Caleb La Grange -# Copyright (C) 2022 Alper Nebi Yasak -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -download=resources/scripts/download -program="" - -main() -{ - ./.gitcheck - ./resources/scripts/misc/versioncheck - - rm -f "build_error" - - if [ $# -lt 1 ]; then - help - die "Please specify arguments." - fi - - program="${1}" - shift 1 - - if [ "${program}" = help ]; then - help - exit 0 - elif [ "${program}" = "all" ]; then - for downloadProgram in ${download}/*; do - if [ ! -f "${downloadProgram}" ]; then - continue - fi - "${downloadProgram}" - done - exit 0 - elif [ ! -f "${download}/${program}" ]; then - help - die "Invalid argument '${program}'. See: './download help'." - elif [ $# -lt 1 ]; then - "${download}/${program}" - else - "${download}/${program}" $@ - fi - - ./.gitcheck clean -} - -help() { - cat <<- EOF - USAGE: ./download - - possible values for 'program': - $(listprograms) - - Example: ./download flashrom - Example: ./download coreboot - - Some program options allow for additional parameters: - Example: ./download coreboot default - Example: ./download coreboot x60 - - Each program download script should work without extra paramaters, but - they can be used. For example, './download coreboot' will download all - coreboot trees by default, but './download coreboot x60' will only - download the coreboot tree required for the target: x60 - - Each program download script should also accept the --help parameter to - display the usage of the script. - - Refer to the documentation for more information. - EOF -} - -listprograms() { - for program in "${download}"/*; do - printf '%s\n' "${program##*/}" - done -} - -die() { - printf 'Error: %s\n' "${@}" 1>&2 - exit 1 -} - -main $@ diff --git a/download b/download new file mode 120000 index 0000000..012b4ec --- /dev/null +++ b/download @@ -0,0 +1 @@ +lbmk \ No newline at end of file diff --git a/lbmk b/lbmk index ca65d42..16f479c 100755 --- a/lbmk +++ b/lbmk @@ -33,6 +33,8 @@ main() { if [ "${0##*/}" = "lbmk" ]; then die "Do not run the lbmk script directly!" + elif [ "${0##*/}" = "download" ]; then + ./update module $@ elif [ $# -lt 2 ]; then die "Too few arguments. Try: ${0} help" fi diff --git a/resources/scripts/download/bios_extract b/resources/scripts/update/module/bios_extract similarity index 100% rename from resources/scripts/download/bios_extract rename to resources/scripts/update/module/bios_extract diff --git a/resources/scripts/download/coreboot b/resources/scripts/update/module/coreboot similarity index 100% rename from resources/scripts/download/coreboot rename to resources/scripts/update/module/coreboot diff --git a/resources/scripts/download/flashrom b/resources/scripts/update/module/flashrom similarity index 100% rename from resources/scripts/download/flashrom rename to resources/scripts/update/module/flashrom diff --git a/resources/scripts/download/grub b/resources/scripts/update/module/grub similarity index 100% rename from resources/scripts/download/grub rename to resources/scripts/update/module/grub diff --git a/resources/scripts/download/me_cleaner b/resources/scripts/update/module/me_cleaner similarity index 100% rename from resources/scripts/download/me_cleaner rename to resources/scripts/update/module/me_cleaner diff --git a/resources/scripts/download/memtest86plus b/resources/scripts/update/module/memtest86plus similarity index 100% rename from resources/scripts/download/memtest86plus rename to resources/scripts/update/module/memtest86plus diff --git a/resources/scripts/download/mrc b/resources/scripts/update/module/mrc similarity index 100% rename from resources/scripts/download/mrc rename to resources/scripts/update/module/mrc diff --git a/resources/scripts/download/seabios b/resources/scripts/update/module/seabios similarity index 100% rename from resources/scripts/download/seabios rename to resources/scripts/update/module/seabios diff --git a/resources/scripts/download/u-boot b/resources/scripts/update/module/u-boot similarity index 100% rename from resources/scripts/download/u-boot rename to resources/scripts/update/module/u-boot