kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-19 09:45:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support new sources format within the lb environment

Browse source
This commit is contained in:
Samuel Tyler 2025-10-04 11:45:06 +10:00
parent 617b516f1f
commit 9d08d181f0
6 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

39
steps/helpers.sh
View file

@ -273,14 +273,9 @@ randomize() {
}
download_source_line() {
if [[ "${1}" == git://* ]]; then
shift
fi
upstream_url="${1}"
checksum="${2}"
fname="${3}"
# Default to basename of url if not given
fname="${fname:-$(basename "${upstream_url}")}"
if ! [ -e "${fname}" ]; then
for mirror in $(randomize "${MIRRORS}"); do
# In qemu SimpleMirror is not running on the guest os, use qemu IP
@ -298,14 +293,9 @@ download_source_line() {
}
check_source_line() {
if [[ "${1}" == git://* ]]; then
shift
fi
url="${1}"
checksum="${2}"
fname="${3}"
# Default to basename of url if not given
fname="${fname:-$(basename "${url}")}"
if ! [ -e "${fname}" ]; then
echo "${fname} does not exist!"
false
@ -315,6 +305,24 @@ check_source_line() {
rm "${fname}.sum"
}
source_line_action() {
action="$1"
shift
type="$1"
shift
case $type in
"g" | "git")
shift
;;
esac
url="${1}"
checksum="${2}"
fname="${3}"
# Default to basename of url if not given
fname="${fname:-$(basename "${url}")}"
$action "$url" "$checksum" "$fname"
}
# Default get function that downloads source tarballs.
default_src_get() {
# shellcheck disable=SC2153
@ -323,22 +331,19 @@ default_src_get() {
while read line; do
# This is intentional - we want to split out ${line} into separate arguments.
# shellcheck disable=SC2086
download_source_line ${line}
source_line_action download_source_line ${line}
done < "${base_dir}/sources"
# shellcheck disable=SC2162
while read line; do
# This is intentional - we want to split out ${line} into separate arguments.
# shellcheck disable=SC2086
check_source_line ${line}
source_line_action check_source_line ${line}
done < "${base_dir}/sources"
cd -
}
# Intelligently extracts a file based upon its filetype.
extract_file() {
if [[ "${1}" == git://* ]]; then
shift
fi
f="${3:-$(basename "${1}")}"
# shellcheck disable=SC2154
case "${noextract}" in
@ -384,7 +389,7 @@ default_src_unpack() {
first_line=$(head -n 1 ../sources)
# Again, we want to split out into words.
# shellcheck disable=SC2086
extract_file ${first_line}
source_line_action extract_file ${first_line}
# This assumes there is only one directory in the tarball
# Get the dirname "smartly"
if ! [ -e "${dirname}" ]; then
@ -398,7 +403,7 @@ default_src_unpack() {
# shellcheck disable=SC2162
tail -n +2 ../sources | while read line; do
# shellcheck disable=SC2086
extract_file ${line}
source_line_action extract_file ${line}
done
}