| author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
| Thu, 12 Jan 2017 14:51:27 -0800 | |
| changeset 7571 | 9e9a7ce5d204 |
| parent 7486 | 57b5a32e1ae4 |
| permissions | -rw-r--r-- |
|
5518
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
1 |
# Export the default variables if they aren't set. |
|
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
2 |
# Otherwise we end up with inconsistently defined/exported |
|
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
3 |
# defaults. |
|
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
4 |
# Solaris-specific patch. |
|
7486
57b5a32e1ae4
25191101 Improve bash integration
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
7485
diff
changeset
|
5 |
# |
|
57b5a32e1ae4
25191101 Improve bash integration
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
7485
diff
changeset
|
6 |
# I don't fully understand what this does. It would be worth discussing with |
|
57b5a32e1ae4
25191101 Improve bash integration
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
7485
diff
changeset
|
7 |
# upstream. They clerly were using the commands at some point in time. |
|
57b5a32e1ae4
25191101 Improve bash integration
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
7485
diff
changeset
|
8 |
|
|
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
9 |
--- variables.c 2011-01-24 17:07:48.000000000 -0800 |
|
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
10 |
+++ variables.c 2011-11-29 09:29:51.902791524 -0800 |
|
7485
89b2d849f322
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5518
diff
changeset
|
11 |
@@ -471,14 +471,12 @@ |
|
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
/* Now make our own defaults in case the vars that we think are |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
important are missing. */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
temp_var = set_if_not ("PATH", DEFAULT_PATH_VALUE);
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
-#if 0 |
|
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
16 |
+ |
|
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
set_auto_export (temp_var); /* XXX */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
-#endif |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
temp_var = set_if_not ("TERM", "dumb");
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
-#if 0 |
|
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
22 |
+ |
|
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
set_auto_export (temp_var); /* XXX */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
-#endif |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
#if defined (__QNX__) |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
/* set node id -- don't import it from the environment */ |