coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-09-20 05:30:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

get.sh: simplify xbget

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-09-12 11:19:42 +01:00
parent b094c60a39
commit c3e2d8c8bc
4 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/get.sh
+5 -17
View File
@@ -139,25 +139,13 @@ xbget()
[ "$1" != "curl" ] && [ "$1" != "copy" ] && [ "$1" != "git" ] && \ [ "$1" != "curl" ] && [ "$1" != "copy" ] && [ "$1" != "git" ] && \
err "Bad dlop (arg 1)" "xbget" "$@" err "Bad dlop (arg 1)" "xbget" "$@"
for url in "$2" "$3" for url in "$2" "$3"; do
do [ -z "$url" ] && \
if [ -z "$url" ]; then
err "empty URL given in" "xbget" "$@" err "empty URL given in" "xbget" "$@"
elif ! try_fetch "$url" "$@"; then try_fetch "$url" "$@" || \
continue continue
fi [ -e "$4" ] && \
return 0; : # successful download/copy
case "$1" in
git)
[ ! -d "$4" ] && \
continue
;;
*)
[ ! -f "$4" ] && \
continue
;;
esac
return 0 # successful download/copy
done done
err "failed to download file/repository" "xbget" "$@"; : err "failed to download file/repository" "xbget" "$@"; :
include/init.sh
+1
View File
@@ -406,6 +406,7 @@ xbmk_git_init()
x_ git -c user.name="xbmk" -c user.email="xbmk@example.com" \ x_ git -c user.name="xbmk" -c user.email="xbmk@example.com" \
tag -a "$version" -m "$projectname $version" \ tag -a "$version" -m "$projectname $version" \
1>/dev/null 2>/dev/null; : 1>/dev/null 2>/dev/null; :
) || err "Can't initialise workdir" xbmk_git_init "$@"; : ) || err "Can't initialise workdir" xbmk_git_init "$@"; :
} }
include/mrc.sh
-1
View File
@@ -58,7 +58,6 @@ extract_partition()
parted "${1%.zip}" 2>/dev/null | grep "ROOT-A" ) parted "${1%.zip}" 2>/dev/null | grep "ROOT-A" )
START=$(( $( echo $ROOTP | cut -f2 -d\ | tr -d "B" ) )) START=$(( $( echo $ROOTP | cut -f2 -d\ | tr -d "B" ) ))
SIZE=$(( $( echo $ROOTP | cut -f4 -d\ | tr -d "B" ) )) SIZE=$(( $( echo $ROOTP | cut -f4 -d\ | tr -d "B" ) ))
x_ dd if="${1%.zip}" of="root-a.ext2" bs=1024 \ x_ dd if="${1%.zip}" of="root-a.ext2" bs=1024 \
include/release.sh
+8 -8
View File
@@ -60,13 +60,13 @@ release()
prep_release() prep_release()
{ {
( (
if [ "$1" != "tarball" ]; then if [ "$1" != "tarball" ]; then
x_ cd "$rsrc" x_ cd "$rsrc"
[ ! -e "cache" ] && \ [ ! -e "cache" ] && \
x_ ln -s "$XBMK_CACHE" "cache"; : x_ ln -s "$XBMK_CACHE" "cache"; :
fi fi
prep_release_$1 prep_release_$1
) || err "can't prep release $1" "prep_release" "$@" ) || err "can't prep release $1" "prep_release" "$@"
} }
@@ -105,8 +105,8 @@ prep_release_tarball()
x_ mv "$rsrc/util/sbase2" "$rsrc/util/sbase" x_ mv "$rsrc/util/sbase2" "$rsrc/util/sbase"
( (
x_ cd "${rsrc%/*}" x_ cd "${rsrc%/*}"
x_ mktarball "${rsrc##*/}" "${rsrc##*/}.tar.xz" x_ mktarball "${rsrc##*/}" "${rsrc##*/}.tar.xz"
) || err "can't create src tarball" "prep_release_tarball" "$@"; : ) || err "can't create src tarball" "prep_release_tarball" "$@"; :
} }