pktsurf/smlinux
1
1
Fork 0
Code Issues 1 Pull requests Wiki Activity

Optimised code to validate build variables and error redirection in bldpkg

Browse source
This commit is contained in:
PktSurf 2023-04-10 15:49:46 +05:30
parent b4fea8960e
commit 78dcdc078b
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
bldpkg
View file

@ -120,18 +120,26 @@ validatebldfile() {
if [[ ! -f $buildfile ]] ; then if [[ ! -f $buildfile ]] ; then
err "No build file to validate from!" err "No build file to validate from!"
else
source $buildfile
fi fi
for reqvars in app version build homepage desc requires ; do
if [[ ! ${!reqvars} ]] ; then
err "Required variable '$reqvars' is not set in $buildfile!"
fi
done
# Validate $app # Validate $app
if ! grep -E -q '^app=[a-z0-9-]' "$buildfile" ; then if ! echo "$app" | grep -E -q '\w[a-z0-9-]+\w'; then
err "Only lower case, numeric characters and dash allowed in the 'app' variable in the build file." err "Only lower case, numeric characters and dash allowed in the 'app' variable in the build file."
# Validate $version # Validate $version
elif ! grep -E -q '^version=[a-z0-9.]' "$buildfile" ; then elif ! echo "$version" | grep -E -q '\w[a-z0-9.]+\w'; then
err "Only lower case, numeric characters and a period allowed in the 'version' variable in the build file." err "Only lower case, numeric characters and a period allowed in the 'version' variable in the build file."
# Validate $homepage # Validate $homepage
elif ! grep -E -q '^homepage="\(https|http||ftp)://' "$buildfile" ; then elif ! echo "$homepage" | grep -E -q '(https|http|ftp)://[^"]+' ; then
err "Invalid URL in the 'homepage' variable in the build file." err "Invalid URL in the 'homepage' variable in the build file."
# Validate $desc using bash shell's ability to count variable length # Validate $desc using bash shell's ability to count variable length
@ -148,8 +156,8 @@ validatebldfile() {
fi fi
# Validate the download variable separately because it's optional # Validate the download variable separately because it's optional
if grep -q '^download=' "$buildfile" ; then if [[ -n $download ]] ; then
if ! grep -q '^download=[*p*://]*' "$buildfile" ; then if ! echo "$download" | grep -E -q '(https|http|ftp)://[^"]+' ; then
err "Invalid URL in the 'download' variable in the build file." err "Invalid URL in the 'download' variable in the build file."
fi fi
fi fi
@ -575,7 +583,7 @@ EOF
fi fi
# Discard install directory if it's empty but don't error out # Discard install directory if it's empty but don't error out
rmdir --ignore-fail-on-non-empty install rmdir lib &> /dev/null || true
# Discard charset.alias # Discard charset.alias
if [[ -f lib/charset.alias ]] ; then if [[ -f lib/charset.alias ]] ; then
@ -584,7 +592,7 @@ EOF
fi fi
# Also discard the lib directory if it's empty but don't error out # Also discard the lib directory if it's empty but don't error out
rmdir --ignore-fail-on-non-empty lib rmdir lib &> /dev/null || true
tar cvf - . --format gnu \ tar cvf - . --format gnu \
--xform 'sx^\./\(.\)x\1x' \ --xform 'sx^\./\(.\)x\1x' \