Skip to content

Commit c76dd2c

Browse files
committed
fix(script): Replace ggrep with grep for compatibility
Updated the on-release-vendor.sh script to replace instances of ggrep with grep to ensure compatibility across different environments. This change improves the script's reliability when processing vendor.json and boards.txt files. Signed-off-by: Chiho Sin <[email protected]>
1 parent c24640b commit c76dd2c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/scripts/on-release-vendor.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ echo "Action: $action, Branch: $RELEASE_BRANCH, ID: $RELEASE_ID"
4141
echo "Tag: $RELEASE_TAG, Draft: $draft, Pre-Release: $RELEASE_PRE"
4242

4343
# Try extracting something like a JSON with a "boards" array/element and "vendor" fields
44-
BOARDS=$(cat "$GITHUB_WORKSPACE/vendor.json" | ggrep -Pzo '(?s){.*}' | jq -r '.boards[]? // .boards? // empty' | xargs echo -n 2>/dev/null)
45-
VENDOR=$(cat "$GITHUB_WORKSPACE/vendor.json" | ggrep -Pzo '(?s){.*}' | jq -r '.vendor? // empty' | xargs echo -n 2>/dev/null)
46-
REPOSITORY_URL=$(cat "$GITHUB_WORKSPACE/vendor.json" | ggrep -Pzo '(?s){.*}' | jq -r '.repository.url? // empty' | xargs echo -n 2>/dev/null)
47-
PACKAGER=$(cat "$GITHUB_WORKSPACE/vendor.json" | ggrep -Pzo '(?s){.*}' | jq -r '.packager? // empty' | xargs echo -n 2>/dev/null)
48-
MAINTAINER=$(cat "$GITHUB_WORKSPACE/vendor.json" | ggrep -Pzo '(?s){.*}' | jq -r '.maintainer? // empty' | xargs echo -n 2>/dev/null)
49-
WEBSITE=$(cat "$GITHUB_WORKSPACE/vendor.json" | ggrep -Pzo '(?s){.*}' | jq -r '.website? // empty' | xargs echo -n 2>/dev/null)
50-
EMAIL=$(cat "$GITHUB_WORKSPACE/vendor.json" | ggrep -Pzo '(?s){.*}' | jq -r '.email? // empty' | xargs echo -n 2>/dev/null)
51-
CATEGORY=$(cat "$GITHUB_WORKSPACE/vendor.json" | ggrep -Pzo '(?s){.*}' | jq -r '.category? // empty' | xargs echo -n 2>/dev/null)
44+
BOARDS=$(cat "$GITHUB_WORKSPACE/vendor.json" | grep -Pzo '(?s){.*}' | jq -r '.boards[]? // .boards? // empty' | xargs echo -n 2>/dev/null)
45+
VENDOR=$(cat "$GITHUB_WORKSPACE/vendor.json" | grep -Pzo '(?s){.*}' | jq -r '.vendor? // empty' | xargs echo -n 2>/dev/null)
46+
REPOSITORY_URL=$(cat "$GITHUB_WORKSPACE/vendor.json" | grep -Pzo '(?s){.*}' | jq -r '.repository.url? // empty' | xargs echo -n 2>/dev/null)
47+
PACKAGER=$(cat "$GITHUB_WORKSPACE/vendor.json" | grep -Pzo '(?s){.*}' | jq -r '.packager? // empty' | xargs echo -n 2>/dev/null)
48+
MAINTAINER=$(cat "$GITHUB_WORKSPACE/vendor.json" | grep -Pzo '(?s){.*}' | jq -r '.maintainer? // empty' | xargs echo -n 2>/dev/null)
49+
WEBSITE=$(cat "$GITHUB_WORKSPACE/vendor.json" | grep -Pzo '(?s){.*}' | jq -r '.website? // empty' | xargs echo -n 2>/dev/null)
50+
EMAIL=$(cat "$GITHUB_WORKSPACE/vendor.json" | grep -Pzo '(?s){.*}' | jq -r '.email? // empty' | xargs echo -n 2>/dev/null)
51+
CATEGORY=$(cat "$GITHUB_WORKSPACE/vendor.json" | grep -Pzo '(?s){.*}' | jq -r '.category? // empty' | xargs echo -n 2>/dev/null)
5252

5353

5454
if [ -n "${BOARDS}" ]; then
@@ -244,13 +244,13 @@ if [ -z "${BOARDS}" ]; then
244244
cp -Rf "$GITHUB_WORKSPACE/variants" "$PKG_DIR/"
245245
else
246246
# Remove all entries not starting with any board code or "menu." from boards.txt
247-
cat "$GITHUB_WORKSPACE/boards.txt" | ggrep "^menu\." > "$PKG_DIR/boards.txt"
247+
cat "$GITHUB_WORKSPACE/boards.txt" | grep "^menu\." > "$PKG_DIR/boards.txt"
248248
for board in ${BOARDS} ; do
249-
cat "$GITHUB_WORKSPACE/boards.txt" | ggrep "^${board}\." >> "$PKG_DIR/boards.txt"
249+
cat "$GITHUB_WORKSPACE/boards.txt" | grep "^${board}\." >> "$PKG_DIR/boards.txt"
250250
done
251251
# Copy only relevant variant files
252252
mkdir "$PKG_DIR/variants/"
253-
board_list=$(cat "${PKG_DIR}"/boards.txt | ggrep "\.variant=" | cut -d= -f2)
253+
board_list=$(cat "${PKG_DIR}"/boards.txt | grep "\.variant=" | cut -d= -f2)
254254
while IFS= read -r variant; do
255255
cp -Rf "$GITHUB_WORKSPACE/variants/${variant}" "$PKG_DIR/variants/"
256256
done <<< "$board_list"
@@ -407,7 +407,7 @@ if [ -n "${BOARDS}" ]; then
407407
boards_json="$boards_json,"
408408
fi
409409
# Extract board name from boards.txt
410-
board_name=$(cat "$GITHUB_WORKSPACE/boards.txt" | ggrep "^${board}\.name=" | cut -d= -f2 | head -1)
410+
board_name=$(cat "$GITHUB_WORKSPACE/boards.txt" | grep "^${board}\.name=" | cut -d= -f2 | head -1)
411411
if [ -z "$board_name" ]; then
412412
# Fallback: convert board ID to display name if not found in boards.txt
413413
board_name=$(echo "$board" | sed 's/_/ /g' | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2))}1')

0 commit comments

Comments
 (0)