Skip to content

Commit 1328bd2

Browse files
kejistankejistan
committed
Merge pull request #1 from acm-uiuc/master
Synchronize with upstream
2 parents 994d2df + e5fd2ba commit 1328bd2

File tree

6 files changed

+171
-44
lines changed

6 files changed

+171
-44
lines changed

‎Proper.terminal

Lines changed: 163 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,151 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>ANSIBlackColor</key>
6+
<data>
7+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
8+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
9+
TxAnMC4xODAzOTIxNTY5IDAuMjAzOTIxNTY4NiAwLjIxMTc2NDcwNTkA0hAREhNaJGNs
10+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
11+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
12+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
13+
</data>
14+
<key>ANSIBlueColor</key>
15+
<data>
16+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
17+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
18+
TxAnMC4yMDM5MjE1Njg2IDAuMzk2MDc4NDMxNCAwLjY0MzEzNzI1NDkA0hAREhNaJGNs
19+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
20+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
21+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
22+
</data>
23+
<key>ANSIBrightBlackColor</key>
24+
<data>
25+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
26+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
27+
TxAnMC4zMzMzMzMzMzMzIDAuMzQxMTc2NDcwNiAwLjMyNTQ5MDE5NjEA0hAREhNaJGNs
28+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
29+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
30+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
31+
</data>
32+
<key>ANSIBrightBlueColor</key>
33+
<data>
34+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
35+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
36+
TxAnMC40NDcwNTg4MjM1IDAuNjIzNTI5NDExOCAwLjgxMTc2NDcwNTkA0hAREhNaJGNs
37+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
38+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
39+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
40+
</data>
41+
<key>ANSIBrightCyanColor</key>
42+
<data>
43+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
44+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
45+
TxAnMC4yMDM5MjE1Njg2IDAuODg2Mjc0NTA5OCAwLjg4NjI3NDUwOTgA0hAREhNaJGNs
46+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
47+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
48+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
49+
</data>
50+
<key>ANSIBrightGreenColor</key>
51+
<data>
52+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
53+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
54+
TxAnMC41NDExNzY0NzA2IDAuODg2Mjc0NTA5OCAwLjIwMzkyMTU2ODYA0hAREhNaJGNs
55+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
56+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
57+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
58+
</data>
59+
<key>ANSIBrightMagentaColor</key>
60+
<data>
61+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
62+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
63+
TxAnMC42Nzg0MzEzNzI1IDAuNDk4MDM5MjE1NyAwLjY1ODgyMzUyOTQA0hAREhNaJGNs
64+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
65+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
66+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
67+
</data>
68+
<key>ANSIBrightRedColor</key>
69+
<data>
70+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
71+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
72+
TxAmMC45MzcyNTQ5MDIgMC4xNjA3ODQzMTM3IDAuMTYwNzg0MzEzNwDSEBESE1okY2xh
73+
c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
74+
ZXLRFxhUcm9vdIABCBEaIy0yNztBSE9cYmRmj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
75+
ABkAAAAAAAAAAAAAAAAAAADY
76+
</data>
77+
<key>ANSIBrightWhiteColor</key>
78+
<data>
79+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
80+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
81+
TxAnMC45MzMxNTI3MjE4IDAuOTMzMzMzMzMzMyAwLjkyNTQ5MDE5NjEA0hAREhNaJGNs
82+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
83+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
84+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
85+
</data>
86+
<key>ANSIBrightYellowColor</key>
87+
<data>
88+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
89+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
90+
TxAnMC45ODgyMzUyOTQxIDAuOTEzNzI1NDkwMiAwLjMwOTgwMzkyMTYA0hAREhNaJGNs
91+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
92+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
93+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
94+
</data>
95+
<key>ANSICyanColor</key>
96+
<data>
97+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
98+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
99+
TxAoMC4wMjM1Mjk0MTE3NiAwLjU5NjA3ODQzMTQgMC42MDM5MjE1Njg2ANIQERITWiRj
100+
bGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNo
101+
aXZlctEXGFRyb290gAEIERojLTI3O0FIT1xiZGaRlqGqsrW+0NPYAAAAAAAAAQEAAAAA
102+
AAAAGQAAAAAAAAAAAAAAAAAAANo=
103+
</data>
104+
<key>ANSIGreenColor</key>
105+
<data>
106+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
107+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
108+
TxAoMC4zMDU4ODIzNTI5IDAuNjAzOTIxNTY4NiAwLjAyMzUyOTQxMTc2ANIQERITWiRj
109+
bGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNo
110+
aXZlctEXGFRyb290gAEIERojLTI3O0FIT1xiZGaRlqGqsrW+0NPYAAAAAAAAAQEAAAAA
111+
AAAAGQAAAAAAAAAAAAAAAAAAANo=
112+
</data>
113+
<key>ANSIMagentaColor</key>
114+
<data>
115+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
116+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
117+
TxAnMC40NTg4MjM1Mjk0IDAuMzEzNzI1NDkwMiAwLjQ4MjM1Mjk0MTIA0hAREhNaJGNs
118+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
119+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
120+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
121+
</data>
122+
<key>ANSIRedColor</key>
123+
<data>
124+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
125+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
126+
SDAuOCAwIDAA0hAREhNaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2Jq
127+
ZWN0XxAPTlNLZXllZEFyY2hpdmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZm90f4iQ
128+
k5yusbYAAAAAAAABAQAAAAAAAAAZAAAAAAAAAAAAAAAAAAAAuA==
129+
</data>
130+
<key>ANSIWhiteColor</key>
131+
<data>
132+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
133+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
134+
TxAnMC44Mjc0NTA5ODA0IDAuODQzMTM3MjU0OSAwLjgxMTc2NDcwNTkA0hAREhNaJGNs
135+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
136+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
137+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
138+
</data>
139+
<key>ANSIYellowColor</key>
140+
<data>
141+
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
142+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
143+
TxAbMC43Njg2Mjc0NTEgMC42Mjc0NTA5ODA0IDAA0hAREhNaJGNsYXNzbmFtZVgkY2xh
144+
c3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hpdmVy0RcYVHJvb3SA
145+
AQgRGiMtMjc7QUhPXGJkZoSJlJ2lqLHDxssAAAAAAAABAQAAAAAAAAAZAAAAAAAAAAAA
146+
AAAAAAAAzQ==
147+
</data>
148+
<key>BackgroundBlur</key>
149+
<real>0.20000000000000001</real>
5150
<key>BackgroundColor</key>
6151
<data>
7152
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
@@ -13,10 +158,11 @@
13158
<key>CursorColor</key>
14159
<data>
15160
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
16-
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VXTlNXaGl0ZYAC
17-
EANNMC4zMDI0MTkzNjQ1ANIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqIS
18-
FFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FIT1xk
19-
Zmh2e4aPl5qjtbi9AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAL8=
161+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
162+
TxAnMC4zNzY0NzA1ODgyIDAuMzc2NDcwNTg4MiAwLjM3NjQ3MDU4ODIA0hAREhNaJGNs
163+
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
164+
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
165+
AAAZAAAAAAAAAAAAAAAAAAAA2Q==
20166
</data>
21167
<key>Font</key>
22168
<data>
@@ -32,7 +178,7 @@
32178
<key>Linewrap</key>
33179
<true/>
34180
<key>ProfileCurrentVersion</key>
35-
<real>2.0099999999999998</real>
181+
<real>2.02</real>
36182
<key>SelectionColor</key>
37183
<data>
38184
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
@@ -41,24 +187,28 @@
41187
cqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FI
42188
T1xiZGZ5fomSmp2muLvAAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAMI=
43189
</data>
190+
<key>ShouldLimitScrollback</key>
191+
<integer>1</integer>
44192
<key>ShowWindowSettingsNameInTitle</key>
45193
<false/>
46194
<key>TextBoldColor</key>
47195
<data>
48196
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
49-
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VXTlNXaGl0ZYAC
50-
EANCMQDSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3Rf
51-
EA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztBSE9cZGZoa3B7hIyPmKqt
52-
sgAAAAAAAAEBAAAAAAAAABkAAAAAAAAAAAAAAAAAAAC0
197+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
198+
TDAuOCAwLjggMC44ANIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhO
199+
U09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FIT1xiZGZz
200+
eIOMlJegsrW6AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAALw=
53201
</data>
54202
<key>TextColor</key>
55203
<data>
56204
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
57-
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VXTlNXaGl0ZYAC
58-
EANNMC45NDc1ODA2MzU1ANIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqIS
59-
FFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FIT1xk
60-
Zmh2e4aPl5qjtbi9AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAL8=
205+
AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAC
206+
TDAuOCAwLjggMC44ANIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhO
207+
U09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FIT1xiZGZz
208+
eIOMlJegsrW6AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAALw=
61209
</data>
210+
<key>UseBoldFonts</key>
211+
<true/>
62212
<key>keyMapBoundKeys</key>
63213
<dict>
64214
<key>$F708</key>

‎commonsh/10_utility

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ err ()
2424
errno=`ruby -e "puts Errno::${errconst}::Errno" 2>/dev/null`
2525
fi
2626
if [ "${errno}" = "" ] && [ -e /usr/include/errno.h ] ; then
27-
errno=`cpp -dM /usr/include/errno.h | grep -E "${errconst}[[:space:]]+[0-9]+$" | grep -oE '[0-9]+' 2>/dev/null`
27+
errno=`cpp -E -dM /usr/include/errno.h | grep -E "${errconst}[[:space:]]+[0-9]+$" | grep -oE '[0-9]+' 2>/dev/null`
2828
fi
2929

3030
if [ "${errno}" ] ; then
@@ -37,7 +37,7 @@ err ()
3737
errno=$1
3838
unset errconst
3939
if [ "${errconst}" = "" ] && command -v ruby > /dev/null 2>&1 ; then
40-
errconst=`ruby -e "puts Errno.constants.find_all{|err| eval('Errno::' + err + '::Errno') == ${errno} }" 2>/dev/null`
40+
errconst=`ruby -e "puts Errno.constants.find_all{|err| Errno.const_get(err)::Errno == ${errno} }" 2>/dev/null`
4141
fi
4242
if [ "${errconst}" = "" ] && command -v python > /dev/null 2>&1 ; then
4343
errconst=`python -c "import errno;print(errno.errorcode[${errno}])" 2>/dev/null`
@@ -46,7 +46,7 @@ err ()
4646
errconst="${errconst} = ${errno}"
4747
fi
4848
if [ "${errconst}" = "" ] && [ -e /usr/include/errno.h ] ; then
49-
errconst=`cpp -dM /usr/include/errno.h | grep -E "E[[:alnum:]]+[[:space:]]+${errno}$"`
49+
errconst=`cpp -E -dM /usr/include/errno.h | grep -E "E[[:alnum:]]+[[:space:]]+${errno}$"`
5050
fi
5151

5252
if [ "${errconst}" ] ; then

‎zsh/completion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ zstyle -e ':completion:*' users "reply=( root '${USERNAME}' )"
2626

2727
# caching good
2828
zstyle ':completion:*' use-cache on
29-
zstyle ':completion:*' cache-path "${HOME}/.zsh/.zcompcache-${LHOSTNAME}"
29+
zstyle ':completion:*' cache-path "${HOME}/.zsh/.zcompcache-${HOST}"
3030

3131
# descriptions
3232
zstyle ':completion:*:messages' format $'%{\e[01;35m%} -- %d -- %{\e[00;00m%}'

‎zsh/prompt

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@ BOLDERRORCOLOR=''
66
BLACKCOLOR=''
77

88
case "${TERM}" in
9-
*256color*)
10-
RESETCOLOR=$'%{\e[00;00m%}'
11-
if [ -z "${SSH_TTY}" ] ; then
12-
HOSTCOLOR=$'%{\e[01;38;5;113m%}'
13-
else
14-
HOSTCOLOR=$'%{\e[01;38;5;80m%}'
15-
fi
16-
PATHCOLOR=$'%{\e[38;5;74m%}'
17-
ERRORCOLOR=$'%{\e[38;5;1m%}'
18-
BOLDERRORCOLOR=$'%{\e[01;38;5;9m%}'
19-
CLOCKCOLOR=$'%{\e[01;38;5;221m%}'
20-
JOBCOLOR=$'%{\e[38;5;30m%}'
21-
BLACKCOLOR=$'%{\e[38;5;232m%}'
22-
;;
239
dumb)
2410
;;
2511
*)
@@ -40,6 +26,6 @@ case "${TERM}" in
4026
;;
4127
esac
4228

43-
PROMPT=${RESETCOLOR}${HOSTCOLOR}$'%n@'${LHOSTNAME}${BLACKCOLOR}':'${PATHCOLOR}$'%45<...<%~ %(?..'${BOLDERRORCOLOR}$')%(!.#.$) '${RESETCOLOR}
29+
PROMPT=${RESETCOLOR}${HOSTCOLOR}$'%n@%m'${BLACKCOLOR}':'${PATHCOLOR}$'%45<...<%~ %(?..'${BOLDERRORCOLOR}$')%(!.#.$) '${RESETCOLOR}
4430

4531
RPROMPT=${RESETCOLOR}$'%1(j.'${JOBCOLOR}$'[%j].)%(?..'${ERRORCOLOR}$'[%?])'${CLOCKCOLOR}$'[%t]'${RESETCOLOR}

‎zsh/title

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ precmd()
33
{
44
local termtitle
55

6-
termtitle=`print -P "%n@${LHOSTNAME}[%l]"`
6+
termtitle=`print -P "%n@${HOST}[%l]"`
77
title zsh "$termtitle"
88
}
99

@@ -15,7 +15,7 @@ preexec()
1515
local termtitle
1616

1717
# Prepend this string to the title.
18-
termtitle=`print -P "%n@${LHOSTNAME}[%l]:"`
18+
termtitle=`print -P "%n@${HOST}[%l]:"`
1919

2020
case $cmd[1] in
2121
fg)

‎zshrc

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,7 @@
33
# Original author: Saleem Abdulrasool <[email protected]>
44
# vim:set nowrap:
55

6-
case `uname -s` in
7-
Darwin)
8-
export LHOSTNAME=`scutil --get LocalHostName`
9-
;;
10-
*)
11-
export LHOSTNAME=${HOST}
12-
;;
13-
esac
14-
15-
autoload compinit; compinit -d "${HOME}/.zsh/.zcompdump-${LHOSTNAME}"
6+
autoload compinit; compinit -d "${HOME}/.zsh/.zcompdump-${HOST}"
167

178
autoload age
189
autoload zmv

0 commit comments

Comments
 (0)