omkar/mattermost-patched-enterprise
1
0
Fork 0
mirror of https://gitlab.anthaathi.net/omkar/mattermost-patched-enterprise.git synced 2026-10-06 13:44:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: Add || true to grep commands to prevent set -e from killing script on no match

Browse Source
This commit is contained in:
WasserEsser
2026-04-30 13:05:27 +02:00
parent 867c03b123
commit 6d16a49ec8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patch.sh
+3 -3
View File
@@ -157,20 +157,20 @@ hexdump -ve '1/1 "%.2x"' "$BINARY_FILE" > "$TEMP_FILE"
log "Searching for rsa.VerifyPKCS1v15 call inside LicenseValidatorImpl.ValidateLicense()" log "Searching for rsa.VerifyPKCS1v15 call inside LicenseValidatorImpl.ValidateLicense()"
# Check if already patched # Check if already patched
PATCHED_COUNT=$(grep -Eo -b "$PATCHED_PATTERN" "$TEMP_FILE" 2>/dev/null | wc -l) PATCHED_COUNT=$(grep -Eo -b "$PATCHED_PATTERN" "$TEMP_FILE" 2>/dev/null | wc -l || true)
if [ "$PATCHED_COUNT" -gt 0 ]; then if [ "$PATCHED_COUNT" -gt 0 ]; then
log "Binary appears to already be patched (jnz instruction found)." log "Binary appears to already be patched (jnz instruction found)."
exit 6 exit 6
fi fi
MATCH_COUNT=$(grep -Eo -b "$SEARCH_PATTERN" "$TEMP_FILE" | wc -l) MATCH_COUNT=$(grep -Eo -b "$SEARCH_PATTERN" "$TEMP_FILE" | wc -l || true)
if [ "$MATCH_COUNT" -gt 1 ]; then if [ "$MATCH_COUNT" -gt 1 ]; then
log "Warning: Found $MATCH_COUNT matches for the pattern. Using the first match." log "Warning: Found $MATCH_COUNT matches for the pattern. Using the first match."
log "If patching fails or produces unexpected results, please report this at:" log "If patching fails or produces unexpected results, please report this at:"
log " https://github.com/<your-repo>/issues" log " https://github.com/<your-repo>/issues"
fi fi
FOUND_OFFSET=$(grep -Eo -b "$SEARCH_PATTERN" "$TEMP_FILE" | awk -F: '{print $1}' | head -n 1) FOUND_OFFSET=$(grep -Eo -b "$SEARCH_PATTERN" "$TEMP_FILE" | awk -F: '{print $1}' | head -n 1 || true)
if [ -z "$FOUND_OFFSET" ]; then if [ -z "$FOUND_OFFSET" ]; then
echo "Call not found!" >&2 echo "Call not found!" >&2