This commit is contained in:
parent
cc3c0ec0eb
commit
f85fe2de77
@ -43,10 +43,10 @@ jobs:
|
|||||||
echo "=== Checking $pkg ==="
|
echo "=== Checking $pkg ==="
|
||||||
cd "$BUILDPKG_BASE/$pkg"
|
cd "$BUILDPKG_BASE/$pkg"
|
||||||
|
|
||||||
# Parse basic fields from build.sh
|
# Parse basic fields from build.sh using GNU grep (ggrep)
|
||||||
topdir=$(grep -E '^topdir=' build.sh | cut -d= -f2)
|
topdir=$(ggrep -E '^topdir=' build.sh | cut -d= -f2)
|
||||||
version=$(grep -E '^version=' build.sh | cut -d= -f2)
|
version=$(ggrep -E '^version=' build.sh | cut -d= -f2)
|
||||||
pkgver=$(grep -E '^pkgver=' build.sh | cut -d= -f2)
|
pkgver=$(ggrep -E '^pkgver=' build.sh | cut -d= -f2)
|
||||||
secname="$topdir"
|
secname="$topdir"
|
||||||
|
|
||||||
# Skip build if package already exists
|
# Skip build if package already exists
|
||||||
@ -57,7 +57,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "=== Building $pkg (version $version pkgver $pkgver) ==="
|
echo "=== Building $pkg (version $version pkgver $pkgver) ==="
|
||||||
LOGFILE=$(bash build.sh all 2>&1 | tee /tmp/build-$pkg.log | grep -oE '[^ ]+\.log' | tail -n1)
|
LOGFILE=$(bash build.sh all 2>&1 | tee /tmp/build-$pkg.log | ggrep -oE '[^ ]+\.log' | tail -n1)
|
||||||
|
|
||||||
if [ -z "$LOGFILE" ]; then
|
if [ -z "$LOGFILE" ]; then
|
||||||
echo "ERROR: Could not detect logfile for $pkg"
|
echo "ERROR: Could not detect logfile for $pkg"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user