From 7291c75daaa69050a7188c0ebd6d6aca01beb7b0 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 11:46:58 -0700 Subject: [PATCH] Fix env loading on mac os x --- .../Contents/Resources/Scripts/main.scpt | Bin 3672 -> 3750 bytes .../Contents/Resources/Scripts/start.sh | 7 +------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt index 14203852c863c1d1794ca4a927cc5cfa672511f6..42e712fdbb8e61f79098c1f89fc0875f63f3bd30 100644 GIT binary patch delta 907 zcmYk4Nl#Nz6vzMfz0#6fUI#G&Q<@MJH6{)Vhm9bJqRgTc(8Qr&QKV9BtKtg3f_a}o zRFp|%azH^80Tq_6Txy~l*KYovYh&U|?m73oGyU$l_e;rObnKUBOE!`qC&2{&pFFH^GbxmSxP>ad{DxtEH;geF|v6Nq$1L7U9udw|n{=ROc!-p_w0T zeuVP!Go*F7tfO3Ya5RS!LxL+l97B!fieafZ2CGw8VmOQAIN^x+%N9ciY6Ai&Y;|GO z!Gql>b#MYICE*=7!(~60-FaX1e2uVvKs}eVsDG^WIo5NC^F120h<~gNxega_k?(B2 zGptL(%2mL@j-0a?o6s0Uqgu&#tMXg!t>;aIR93lO9f~z^(LodJq?}DYzU2bv72g7i z3r5VFYKuU?1O!8{;pH1N%hX<@g>y;_gv9pn6<_iNpKHEysUx2Rw%p3DT$ cVjf*b7#(hxH!Hu@2Ihx>lTi|jKV-IE^-aWQK`9RU&{|hj>BjXZY}C@0#%j- z)$tEUQSC!D)F@6C;UqL#5Jwi*QEH(IDkY>S>bUCVs(sZHyjls9A8?BAwIr8LwBJZt zI0fT~0?wm}?-0=vT)OqvjZO=Z?ROf`$Q6?-P;R~l46Xwf!rRRNicwRD8nxniI3Ihs zoxWIY7)O=-oyg{{KD|g8Ba$Y7Zk^IswvWoBda0dB)zCbfd(n|amL_`BY4gc z{M-?B)(PjZ6NP-nr<~>#!%tAkNltK_V;toOhdIPSK1MYMG@psX=}cFrmrot>yEUif zOD114P^iT diff --git a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh index 904bdd166a..4d2ac3fd68 100755 --- a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh +++ b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh @@ -52,9 +52,4 @@ EOF echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}dev${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip dev)${NC}" echo -if [[ $SHELL == *"fish" ]]; then - $SHELL -c "eval ($DOCKER_MACHINE env $VM)" -else - $SHELL -c "eval $($DOCKER_MACHINE env $VM)" -fi - +eval $($DOCKER_MACHINE env $VM --shell=bash)