Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/remove-abspath-cleanup'

Browse source 
* origin/topic/timw/remove-abspath-cleanup:
  diff-remove-abspath: Add separate handling of Windows paths
  diff-remove-abspath: Remove capture of windows drive letters from POSIX regex
This commit is contained in:
Tim Wojtulewicz 2024-11-12 12:26:41 -07:00
commit 0217208c49
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
7.1.0-dev.516 | 2024-11-12 12:26:41 -0700
* diff-remove-abspath: Add separate handling of Windows paths (Tim Wojtulewicz)
* diff-remove-abspath: Remove capture of windows drive letters from POSIX regex (Tim Wojtulewicz)
7.1.0-dev.513 | 2024-11-12 16:16:11 +0100 7.1.0-dev.513 | 2024-11-12 16:16:11 +0100
* Bump Spicy to current `main`. (Robin Sommer, Corelight) * Bump Spicy to current `main`. (Robin Sommer, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.1.0-dev.513 7.1.0-dev.516

5
testing/scripts/diff-remove-abspath
View file

@ -2,6 +2,9 @@
# #
# Replace absolute paths with the basename. # Replace absolute paths with the basename.
# The drive letter portion of the Windows regex below is adapted from
# https://github.com/stdlib-js/stdlib/blob/develop/lib/node_modules/%40stdlib/regexp/basename-windows/lib/regexp.js
sed -E 's#/+#/#g' | sed -E 's#/+#/#g' |
sed -E 's#[^( ]*testing_btest#<___>testing_btest#' | sed -E 's#[^( ]*testing_btest#<___>testing_btest#' |
sed -E 's#([a-zA-Z]:)?/([^ :/]{1,}/){1,}([^ :/]{1,})#<...>/\3#g' sed -E 's#/([^ :/]{1,}/){1,}([^ :/]{1,})#<...>/\2#g' |
sed -E 's#([a-zA-Z]:|[\\/]{2}[^\\/]+[\\/]+[^\\/]+)([\\/])([^ :\\/]{1,}[\\/]){1,}([^ :\\/]{1,})#<...>/\4#g'