ugrep: make more compatible

diff --git a/core/ugrep/build b/core/ugrep/build
index 499542568fb9e7b157ce2225a9b35b127c15bf66..5a77b7a6bca168505e6591ae1dcef7f2ce3581f2 100755 (executable)
--- a/core/ugrep/build
+++ b/core/ugrep/build
@@ -8,7 +8,8 @@
 make
 make DESTDIR="$1" install
 
-ln -s /usr/bin/ugrep "$1/usr/bin/grep"
 ln -s /usr/share/man/man1/ugrep.1 "$1/usr/share/man/man1/grep.1"
-install -Dm755 fgrep "$1/usr/bin/fgrep"
-install -Dm755 egrep "$1/usr/bin/egrep"
+
+for i in grep fgrep egrep; do
+    install -Dm755 "$i" "$1/usr/bin/$i"
+done

diff --git a/core/ugrep/checksums b/core/ugrep/checksums
index c287ced35bcd1deccaba039b55fa50b05b8a204e..9ca7d6b0f58126f743ce5d2198418219ea644cd0 100644 (file)
--- a/core/ugrep/checksums
+++ b/core/ugrep/checksums
@@ -1,3 +1,4 @@
 b5eca59aa67020052e5f796dfaddc1cb30ee9dd6e4cd89fb5cde1e3f110584ff
-f5490817fc1d9710e1d4db72e5587768c7a2308678ba106be4061e8e3e4da3f2
-658e6bbf4ef150e92e4bbf400fa44691e3064413a27492e0175044a831dba315
+d867e90a7fcdf4b1204dd9ef1110fef912c01bbc4704b790a740d6d7477a4600
+dd3e6f6ddc258b1dc1133bb9e0d1cafe088e309e4bf1465e9fb255f431f2985b
+0c35b018adbba13a3c848c5fe79d6718017b6b7385a5323429ab3673fdcc4fa9

diff --git a/core/ugrep/files/egrep b/core/ugrep/files/egrep
index 6712c41a6d111502e2368d71a341c7132377c59a..13df85be201b03435821bff0224e89f68ce725f6 100644 (file)
--- a/core/ugrep/files/egrep
+++ b/core/ugrep/files/egrep
@@ -1,3 +1,3 @@
 #!/usr/bin/sh -e
 
-grep -E $@
+ugrep --sort -E -U -Y -. -Dread -dread $@

diff --git a/core/ugrep/files/fgrep b/core/ugrep/files/fgrep
index e5ca232f1cf0b7bfed31d06d50a38c1616bb80e0..01299a569fd2385252feadd8c90910f2c99730ea 100644 (file)
--- a/core/ugrep/files/fgrep
+++ b/core/ugrep/files/fgrep
@@ -1,3 +1,3 @@
 #!/usr/bin/sh -e
 
-grep -F $@
+ugrep --sort -F -U -Y -. -Dread -dread

diff --git a/core/ugrep/files/grep b/core/ugrep/files/grep
new file mode 100644 (file)
index 0000000..390cb81
--- /dev/null
+++ b/core/ugrep/files/grep
@@ -0,0 +1,3 @@
+#!/usr/bin/sh -e
+
+ugrep --sort -G -U -Y -. -Dread -dread $@

diff --git a/core/ugrep/sources b/core/ugrep/sources
index 6ce4050d8dee97bc8e02847891130e0eca0c487e..79e6a3b50d783f5c5ac4a1722adc6c870a840bc6 100644 (file)
--- a/core/ugrep/sources
+++ b/core/ugrep/sources
@@ -1,3 +1,4 @@
 https://github.com/Genivia/ugrep/archive/refs/tags/v3.3.4.tar.gz
-files/fgrep
+files/grep
 files/egrep
+files/fgrep

diff --git a/core/ugrep/version b/core/ugrep/version
index 0137b782d03bdc966bc880104c3ad24b7d81e69e..96f2b398701a374522751f37382076f7cd353915 100644 (file)
--- a/core/ugrep/version
+++ b/core/ugrep/version
@@ -1,2 +1,2 @@
-3.3.4 3
+3.3.4 4