mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-09 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

sqg: Check for invalid .info files before processing.

Browse Source 
Fixed #46.

Signed-off-by: Willy Sudiarto Raharjo <willysr@sbopkg.org>
This commit is contained in:
Willy Sudiarto Raharjo 2018-06-07 06:03:54 +07:00
parent 1bba4609d7
commit 35ceb9ce32
No known key found for this signature in database
GPG Key ID: 887B8374D7333381
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/usr/libexec/sbopkg/sqg/functions
View File

@ -234,3 +234,19 @@ execute_build () {
build_queuefile_custom "$QUEUEDIR" "$CUSTOM_QUEUE" "$PKGS" build_queuefile_custom "$QUEUEDIR" "$CUSTOM_QUEUE" "$PKGS"
fi fi
} }
#
# Check .info validity
# We only check for PRGNAM for now, but more may be added in the future
#
check_validity() {
local INFO_FILE="$1"
check_program=`grep PRGNAM $INFO_FILE`
if [ $? -eq 0 ]; then
return 0
else
return 1
fi
}

17
src/usr/libexec/sbopkg/sqg/sqg-build-queuefile
View File

@ -9,13 +9,22 @@ INFO="$3"
VERBOSE="${4:-no}" VERBOSE="${4:-no}"
CUSTOM_QUEUE="${5:-}" CUSTOM_QUEUE="${5:-}"
. $INFO check_validity $INFO
if [ "$VERBOSE" == "yes" ]; then if [ $? -ne 0 ]; then
echo ""
echo "Found invalid .info file: $INFO. Skipping."
echo ""
continue;
else
. $INFO
if [ "$VERBOSE" == "yes" ]; then
INFO_BASENAME=$(basename $INFO .info) INFO_BASENAME=$(basename $INFO .info)
echo "Processing $INFO_BASENAME." echo "Processing $INFO_BASENAME."
fi fi
if [[ ! -z $REQUIRES ]]; then if [[ ! -z $REQUIRES ]]; then
build_queuefile "$REPO_DIR" "$QUEUEDIR" "$PRGNAM" "$CUSTOM_QUEUE" build_queuefile "$REPO_DIR" "$QUEUEDIR" "$PRGNAM" "$CUSTOM_QUEUE"
fi
fi fi