author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
Mon, 10 Oct 2016 13:26:21 -0700 | |
changeset 7081 | 616e1d8621e7 |
parent 5391 | 5aa4a8c4577f |
permissions | -rw-r--r-- |
4574
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
1 |
This patch was created inhouse and is not applicable for submitting to |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
2 |
upstream. This is because it implements Solaris oddity - having the binaries |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
3 |
available both without prefix and with 'g' prefix at the same time, only in |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
4 |
different paths. |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
5 |
|
5391
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4574
diff
changeset
|
6 |
--- grep-2.22-orig/src/egrep.sh Wed Oct 21 22:00:20 2015 |
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4574
diff
changeset
|
7 |
+++ grep-2.22/src/egrep.sh Tue Jan 19 14:42:27 2016 |
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4574
diff
changeset
|
8 |
@@ -1,2 +1,29 @@ |
4574
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
9 |
#!@SHELL@ |
5391
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4574
diff
changeset
|
10 |
-exec @grep@ @option@ "$@" |
4574
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
11 |
+# The script is a wrapper to GNU grep to be called with apropriate (-E or -F) |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
12 |
+# command line option. We can't just run 'ggrep' as the path may not contain |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
13 |
+# '/usr/bin' and we can't just use 'grep' as the PATH may not contain |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
14 |
+# '/usr/gnu/bin'. Also we can't just use fixed path as /usr/gnu/bin/grep because |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
15 |
+# this script must work even from workspace before being installed into /usr/... |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
16 |
+# testing the binaries from the workspace. |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
17 |
+ |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
18 |
+if [[ "$( /usr/bin/basename "$0" )" == g* ]]; then |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
19 |
+ # gfgrep or gegrep (potentially in /usr/bin) |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
20 |
+ grep=ggrep |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
21 |
+else |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
22 |
+ # fgrep or egrep in (potentially in /usr/gnu/bin) |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
23 |
+ grep=grep |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
24 |
+fi |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
25 |
+ |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
26 |
+case "$0" in |
5391
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4574
diff
changeset
|
27 |
+ */*) |
4574
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
28 |
+ dir="${0%/*}" |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
29 |
+ if test -x "$dir/$grep"; then |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
30 |
+ PATH="$dir:$PATH" |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
31 |
+ fi |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
32 |
+ ;; |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
33 |
+ *) |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
34 |
+ PATH="@prefix@/bin:$PATH" |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
35 |
+ ;; |
5391
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4574
diff
changeset
|
36 |
+esac |
4574
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
37 |
+ |
7ddafe81d631
20571824 gegrep fails unless /usr/gnu/bin is in PATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
38 |
+exec "$grep" @option@ "$@" |