Skip to content

Commit e8e4cf4

Browse files
dprankedpranke
committed
update mac-specific settings
1 parent db67a7a commit e8e4cf4

File tree

4 files changed

+52
-61
lines changed

4 files changed

+52
-61
lines changed

‎.bashrc.funcs

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ function ap() {
6161
return
6262
fi
6363

64-
if [[ ( "${!var}" = "${after}" ) || ( "${!var}" =~ ^"${after}:" ) ]] then
64+
if [[ ( "${!var}" = "${after}" ) || ( "${!var}" =~ ^"${after}:" ) ]] ; then
6565
export ${var}=${!var/${after}/"${after}:${dir}"}
6666
vecho "${dir} added to ${var} after ${after}"
67-
elif [[ "${!var}" =~ ":${after}:" ]] then
67+
elif [[ "${!var}" =~ ":${after}:" ]] ; then
6868
export ${var}=${!var/:${after}:/:"${after}:${dir}":}
6969
vecho "${dir} added to ${var} after ${after}"
70-
elif [[ "${!var}" =~ ":${after}"$ ]] then
70+
elif [[ "${!var}" =~ ":${after}"$ ]] ; then
7171
export ${var}=${!var/:${after}/:"${after}:${dir}"}
7272
vecho "${dir} added to ${var} after ${after}"
7373
else

‎.bashrc.funcs.chrome

+42-4
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,51 @@ function occ() {
3232
}
3333

3434
function odc() {
35-
$csrc/out/dbg/chrome --user-data-dir=$src/udd.dbg --enable-logging=stderr \
36-
--log-level=0 "$@"
35+
if [[ "${os}" = "Darwin" ]]; then
36+
if $(grep -q "is_chrome_branded = true" $csrc/out/dbg/args.gn)
37+
then
38+
echo "$csrc/out/dbg/Google Chrome.app/Contents/MacOS/Google Chrome" \
39+
--user-data-dir=$src/udd.dbg --disable-features="MediaRouter" \
40+
--enable-logging=stderr --log-level=0 "$@"
41+
"$csrc/out/dbg/Google Chrome.app/Contents/MacOS/Google Chrome" \
42+
--user-data-dir=$src/udd.dbg --disable-features="MediaRouter" \
43+
--enable-logging=stderr --log-level=0 "$@"
44+
else
45+
echo "$csrc/out/dbg/Chromium.app/Contents/MacOS/Chromium" \
46+
--user-data-dir=$src/udd.dbg --disable-features="MediaRouter" \
47+
--enable-logging=stderr --log-level=0 "$@"
48+
"$csrc/out/dbg/Chromium.app/Contents/MacOS/Chromium" \
49+
--user-data-dir=$src/udd.dbg --disable-features="MediaRouter" \
50+
--enable-logging=stderr --log-level=0 "$@"
51+
fi
52+
else
53+
$csrc/out/dbg/chrome --user-data-dir=$src/udd.dbg --enable-logging=stderr \
54+
--log-level=0 "$@"
55+
fi
3756
}
3857

3958
function orc() {
40-
$csrc/out/rel/chrome --user-data-dir=$src/udd.rel --enable-logging=stderr \
41-
--log-level=0 "$@"
59+
if [[ "${os}" = "Darwin" ]]; then
60+
if $(grep -q "is_chrome_branded = true" $csrc/out/rel/args.gn)
61+
then
62+
echo "$csrc/out/rel/Google Chrome.app/Contents/MacOS/Google Chrome" \
63+
--user-data-dir=$src/udd.rel --disable-features="MediaRouter" \
64+
--enable-logging=stderr --log-level=0 "$@"
65+
"$csrc/out/rel/Google Chrome.app/Contents/MacOS/Google Chrome" \
66+
--user-data-dir=$src/udd.rel --disable-features="MediaRouter" \
67+
--enable-logging=stderr --log-level=0 "$@"
68+
else
69+
echo "$csrc/out/rel/Chromium.app/Contents/MacOS/Chromium" \
70+
--user-data-dir=$src/udd.rel --disable-features="MediaRouter" \
71+
--enable-logging=stderr --log-level=0 "$@"
72+
"$csrc/out/rel/Chromium.app/Contents/MacOS/Chromium" \
73+
--user-data-dir=$src/udd.rel --disable-features="MediaRouter" \
74+
--enable-logging=stderr --log-level=0 "$@"
75+
fi
76+
else
77+
$csrc/out/rel/chrome --user-data-dir=$src/udd.rel --enable-logging=stderr \
78+
--log-level=0 "$@"
79+
fi
4280
}
4381

4482
function or2c() {

‎.bashrc.funcs.mac

-39
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,3 @@
1-
function odc() {
2-
if $(grep -q "is_chrome_branded = true" $csrc/out/dbg/args.gn)
3-
then
4-
echo "$csrc/out/dbg/Google Chrome.app/Contents/MacOS/Google Chrome" \
5-
--user-data-dir=$src/udd.dbg --disable-features="MediaRouter" \
6-
--enable-logging=stderr --log-level=0 "$@"
7-
"$csrc/out/dbg/Google Chrome.app/Contents/MacOS/Google Chrome" \
8-
--user-data-dir=$src/udd.dbg --disable-features="MediaRouter" \
9-
--enable-logging=stderr --log-level=0 "$@"
10-
else
11-
echo "$csrc/out/dbg/Chromium.app/Contents/MacOS/Chromium" \
12-
--user-data-dir=$src/udd.dbg --disable-features="MediaRouter" \
13-
--enable-logging=stderr --log-level=0 "$@"
14-
"$csrc/out/dbg/Chromium.app/Contents/MacOS/Chromium" \
15-
--user-data-dir=$src/udd.dbg --disable-features="MediaRouter" \
16-
--enable-logging=stderr --log-level=0 "$@"
17-
fi
18-
}
19-
20-
function orc() {
21-
if $(grep -q "is_chrome_branded = true" $csrc/out/rel/args.gn)
22-
then
23-
echo "$csrc/out/rel/Google Chrome.app/Contents/MacOS/Google Chrome" \
24-
--user-data-dir=$src/udd.rel --disable-features="MediaRouter" \
25-
--enable-logging=stderr --log-level=0 "$@"
26-
"$csrc/out/rel/Google Chrome.app/Contents/MacOS/Google Chrome" \
27-
--user-data-dir=$src/udd.rel --disable-features="MediaRouter" \
28-
--enable-logging=stderr --log-level=0 "$@"
29-
else
30-
echo "$csrc/out/rel/Chromium.app/Contents/MacOS/Chromium" \
31-
--user-data-dir=$src/udd.rel --disable-features="MediaRouter" \
32-
--enable-logging=stderr --log-level=0 "$@"
33-
"$csrc/out/rel/Chromium.app/Contents/MacOS/Chromium" \
34-
--user-data-dir=$src/udd.rel --disable-features="MediaRouter" \
35-
--enable-logging=stderr --log-level=0 "$@"
36-
fi
37-
}
38-
39-
401
function e() {
412
if which mvim > /dev/null
423
then

‎.bashrc.mac

+7-15
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
. $HOME/.bashrc.funcs
66
. $HOME/.bashrc.funcs.mac
7-
. $HOME/.git_completion.bash
87

98
# bump up the default # of files and the default stack size per process.
109
ulimit -n unlimited -s 16384
@@ -18,30 +17,20 @@ fi
1817

1918
export dt=$src/depot_tools
2019

21-
PATH=/usr/bin:/sbin:/bin
22-
ip /usr/sbin
23-
ip /usr/local/sbin
24-
ip /usr/local/bin
25-
ip /usr/local/git/git-google/bin
26-
ip /usr/local/git/current/bin
27-
2820
if [ -d /usr/local/Homebrew ]
2921
then
3022
HOMEBREW=/usr/local
3123
elif [ -d /opt/homebrew ]
3224
then
3325
HOMEBREW=/opt/homebrew
34-
ip $HOMEBREW/bin
3526
elif [ -d $HOME/homebrew ]
3627
then
3728
HOMEBREW=$HOME/homebrew
38-
ip $HOMEBREW/bin
3929
fi
4030

41-
ip $src/google-cloud-sdk/bin
42-
ip $dt
43-
ip $HOME/bin
44-
ip $HOME/mbin
31+
export PATH=
32+
ip $HOME/mbin $HOME/bin $dt $HOMEBREW/bin $src/google-cloud-sdk/bin \
33+
/usr/local/bin /usr/local/sbin /usr/sbin /usr/bin /sbin /bin
4534

4635
if which mvim > /dev/null
4736
then
@@ -50,14 +39,17 @@ else
5039
export EDITOR=vi
5140
fi
5241

53-
export EMAIL_ADDRESS=dpranke@gmail.com
42+
export EMAIL_ADDRESS=dpranke@chromium.org
5443
export HISTSIZE=500
5544
export INFOPATH=/usr/local/info:/opt/local/info
5645
export MANPATH=/usr/local/share/man:/opt/local/man:/usr/share/man
5746
export NINJA_JOBS=''
5847
export PAGER=less
5948
export BASH_SILENCE_DEPRECATION_WARNING=1
6049

50+
# TODO: Figure out if I still want to use this
51+
. $HOME/.git_completion.bash
52+
6153
# Enable shell completion for gcloud.
6254
if [ -f "$src/google-cloud-sdk/completion.bash.inc" ]
6355
then

0 commit comments

Comments
 (0)