add run parameter and unify usage message

This commit is contained in:
Tobias Powalowski 2024-08-01 12:22:44 +02:00
parent e3db4b0166
commit 405b332f7a
8 changed files with 34 additions and 6 deletions

View file

@ -3,6 +3,7 @@
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/bootloader.sh . /usr/lib/archboot/bootloader.sh
[[ -z "${1}" || "${1}" != "run" ]] && _usage
_SHIM=$(mktemp -d shim.XXX) _SHIM=$(mktemp -d shim.XXX)
_SHIM32=$(mktemp -d shim32.XXX) _SHIM32=$(mktemp -d shim32.XXX)
_SHIMAA64=$(mktemp -d shimaa64.XXX) _SHIMAA64=$(mktemp -d shimaa64.XXX)

View file

@ -2,8 +2,6 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# archboot-hwsim.sh - setup a test SSID # archboot-hwsim.sh - setup a test SSID
# by Tobias Powalowski <tpowa@archlinux.org> # by Tobias Powalowski <tpowa@archlinux.org>
# usage(exitvalue)
# outputs a usage message and exits with value
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
_usage() _usage()
{ {

View file

@ -3,6 +3,7 @@
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/qemu.sh . /usr/lib/archboot/qemu.sh
[[ -z "${1}" || "${1}" != "run" ]] && _usage
_UBOOT=$(mktemp -d uboot.XXX) _UBOOT=$(mktemp -d uboot.XXX)
_OVMF32=$(mktemp -d ovmf32.XXX) _OVMF32=$(mktemp -d ovmf32.XXX)
_OVMF=$(mktemp -d ovmf.XXX) _OVMF=$(mktemp -d ovmf.XXX)

View file

@ -8,12 +8,12 @@
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
_usage() _usage()
{ {
echo -e "\e[1mWelcome to \e[36mARCHBOOT\e[m \e[1m- RESTORE USB STICK:\e[m" echo -e "\e[1m\e[36mARCHBOOT\e[m \e[1m- Restore USB Stick\e[m"
echo -e "\e[1m----------------------------------------\e[m" echo -e "\e[1m----------------------------\e[m"
echo -e "This script restores an USB device to a \e[1mFAT32\e[m device." echo -e "This script restores an USB device to a \e[1mFAT32\e[m device."
echo -e "\e[91mWARNING: ALL DATA WILL BE LOST ON THE DEVICE! \e[m" echo -e "\e[1m\e[91mWARNING: ALL DATA WILL BE LOST ON THE DEVICE! \e[m"
echo "" echo ""
echo -e "usage: \e[1m${_BASENAME} <device>\e[m" echo -e "Usage: \e[1m${_BASENAME} <device>\e[m"
exit 0 exit 0
} }
################################################## ##################################################

View file

@ -12,6 +12,15 @@ _SHIM_AA64_RPM="aarch64/shim-aa64-${_SHIM_VERSION}-${_SHIM_RELEASE}.aarch64.rpm"
_ARCH_SERVERDIR="/${_PUB}/src/bootloader" _ARCH_SERVERDIR="/${_PUB}/src/bootloader"
_GRUB_ISO="/usr/share/archboot/grub/archboot-iso-grub.cfg" _GRUB_ISO="/usr/share/archboot/grub/archboot-iso-grub.cfg"
_usage() {
echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Bootloader\e[m"
echo -e "\e[1m----------------\e[m"
echo "Upload bootloaders to archboot server."
echo ""
echo -e "Usage: \e[1m${_BASENAME} run\e[m"
exit 0
}
_grub_mkstandalone() { _grub_mkstandalone() {
#shellcheck disable=SC2086 #shellcheck disable=SC2086
${1} ${2} grub-mkstandalone -d "/usr/lib/grub/${_GRUB_ARCH}" -O "${_GRUB_ARCH}" \ ${1} ${2} grub-mkstandalone -d "/usr/lib/grub/${_GRUB_ARCH}" -O "${_GRUB_ARCH}" \

View file

@ -14,6 +14,15 @@ _UBOOT_URL="http://ftp.us.debian.org/debian/pool/main/u/u-boot"
_UBOOT_DEB="u-boot-qemu_${_UBOOT_VERSION}+${_UBOOT_RELEASE}.deb" _UBOOT_DEB="u-boot-qemu_${_UBOOT_VERSION}+${_UBOOT_RELEASE}.deb"
_ARCH_SERVERDIR="/${_PUB}/src/qemu" _ARCH_SERVERDIR="/${_PUB}/src/qemu"
_usage() {
echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Qemu\e[m"
echo -e "\e[1m----------------\e[m"
echo "Upload qemu files to archboot server."
echo ""
echo -e "Usage: \e[1m${_BASENAME} run\e[m"
exit 0
}
_prepare_files () { _prepare_files () {
# download packages from fedora server # download packages from fedora server
echo "Downloading Fedora OVMF and Debian UBOOT..." echo "Downloading Fedora OVMF and Debian UBOOT..."

View file

@ -2,6 +2,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/server.sh . /usr/lib/archboot/server.sh
[[ -z "${1}" || "${1}" != "run" ]] && _usage
_root_check _root_check
_container_check _container_check
if echo "${_BASENAME}" | rg -qw 'riscv64' || echo "${_BASENAME}" | rg -qw 'aarch64'; then if echo "${_BASENAME}" | rg -qw 'riscv64' || echo "${_BASENAME}" | rg -qw 'aarch64'; then

View file

@ -5,6 +5,15 @@
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
_ISO_BUILD_DIR="$(mktemp -d "${_ISO_HOME_ARCH}"/server-release.XXX)" _ISO_BUILD_DIR="$(mktemp -d "${_ISO_HOME_ARCH}"/server-release.XXX)"
_usage() {
echo -e "\e[1m\e[36mArchboot\e[m\e[1m - Server Release\e[m"
echo -e "\e[1m----------------\e[m"
echo "Upload new image to archboot server."
echo ""
echo -e "Usage: \e[1m${_BASENAME} run\e[m"
exit 0
}
_update_pacman_container() { _update_pacman_container() {
if [[ "${_ARCH}" == "aarch64" ]]; then if [[ "${_ARCH}" == "aarch64" ]]; then
_ARCH_DIR="${_PACMAN_AARCH64}" _ARCH_DIR="${_PACMAN_AARCH64}"