Files
ding/use-grep-instead-of-egrep.patch
Daniel Donisa b37663c620 Accepting request 1004480 from home:mnhauke
- Add patch:
  * use-grep-instead-of-egrep.patch
    This prevents the egrep obsolescent warning message introduced
    with grep 3.8:
    "egrep: warning: egrep is obsolescent; using grep -E"
- Install man-page
- Use https instead of http/ftp for Source/URL

OBS-URL: https://build.opensuse.org/request/show/1004480
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/ding?expand=0&rev=14
2022-09-19 10:24:53 +00:00

50 lines
2.1 KiB
Diff

diff --git a/ding b/ding
index d282eaa..47b876b 100755
--- a/ding
+++ b/ding
@@ -84,7 +84,7 @@ set param(noticefile) [expr {$param(isunix) == 1 ? "$env(HOME)/.dingnotice.txt"
# The default search methods
# The provided German-English dictionary:
set default_searchmeth(0,name) {Dictionary}
-set default_searchmeth(0,grepcmds) {tre-agrep agrep egrep internal_search}
+set default_searchmeth(0,grepcmds) {tre-agrep grep agrep internal_search}
set default_searchmeth(0,dictfile) [expr {$param(isunix) ? "/usr/share/dict/de-en.txt" : "[file dirname argv0]/de-en.txt"}]
set default_searchmeth(0,separator) { :: }
set default_searchmeth(0,language1) {Deutsch}
@@ -119,7 +119,7 @@ set default_searchmeth(4,minlength) 0
# check for these search commands
set default_grepcmds(tre-agrep) "-h"
set default_grepcmds(agrep) "-h"
-set default_grepcmds(egrep) "-h -a"
+set default_grepcmds(grep) "-E -a"
set default_grepcmds(dict) ""
set default_grepcmds(hunspell) "-B -S -a"
set default_grepcmds(ispell) "-B -S -a"
@@ -2923,7 +2923,7 @@ proc dictsearch {query args} {
} else {
# prepare simple pattern for other grep cmd: * -> .*
regsub -all {\*} $squery ".*" squery
- set squery [umlautquery $squery "egrep"]
+ set squery [umlautquery $squery "grep"]
}
# q is for priority sorting
regsub -all {[[\*+)(]} $query "" q
@@ -3893,7 +3893,7 @@ Zur Funktionsweise: } bfont
.help.text insert end "\n * "
.help.text insert end "Hilfe zu Abkürzungen" abblink
.help.text insert end "
- * Unix-Manuals zu agrep, egrep, ispell, dict\n\n"
+ * Unix-Manuals zu agrep, grep, ispell, dict\n\n"
} else { # english
.help.text insert end {Start search:} bfont
@@ -3983,7 +3983,7 @@ How it works: } bfont
.help.text insert end "\n * "
.help.text insert end "Help on abbreviations" abblink
.help.text insert end "
- * Unix manual pages for agrep, egrep, ispell, dict \n\n"
+ * Unix manual pages for agrep, grep, ispell, dict \n\n"
}
.help.text configure -state disabled
}