Use the iso put down by the OSX installer too - and make the Linux share...

[SvenDowideit]

...d path saner too

Signed-off-by: Sven Dowideit SvenDowideit@home.org.au

follow on for #283

@tianon @gmlewis

[gmlewis]

LGTM

[tianon]

I'm actually -1 on this, and here's what I think would be a better solution that's less path-dependent from the boot2docker-cli PoV: (ie, solves it in the OS X installer and keeps the boot2docker-cli code reasonably assumption-free)

• move the osx-installer binary from /usr/local/bin/boot2docker to /usr/local/share/boot2docker/boot2docker-cli
• ln -s /usr/local/share/boot2docker/boot2docker-cli /usr/local/bin/boot2docker
• ISO is still installed at /usr/local/share/boot2docker/boot2docker.iso as today

This way, the code we've already got will "just work", and any future updates will only have to happen in one place (ie, the one place we've hard-coded the assumption - the installer itself).

[tianon]

Also though, I don't think OS X having a perfect solution to this is something that's actually necessary for 1.3, is it? @bfirsh led me to believe that users clicking on boot2docker.app get the ISO re-copied to ~/.boot2docker/ regardless. Is this not the case? 🐑

[SvenDowideit]

not every OSX user uses the icon - very many of them use the boot2docker cli directly (as can be seen by the questions in issues and irc)

if you want to re-write, change the installer, and re-test everything, go for it - I'm currently finding that the existing code is failing on windows, and need to debug why. (its looking like it was an older version of b2d-cli thank goodness)

[SvenDowideit]

actually, I was just tripped up by your 'way too clever' approach. I copied a new version of the b2d-cli binary to a computer, put in a different dir, and rather than it looking in the one place the iso is actually installed - the installer dir, it defaulted to the old location, and downloaded.

No, I'm pretty -1 to your suggestion that we put the binary and the data into /usr/local/share/boot2docker, then softlink the binary into /usr/local/bin, and then write the code to assume that the default iso moves around wherever someone builds a custom version of the boot2docker binary.

I'd rather have the one disk location that is maintained by the installer be used when I'm developing boot2docker-cli....

[SvenDowideit]

that said, i think this PR broke windows, so - i'm looking into it

oh, look at that, an extra : - mumble

[tianon]

In that case, let's back out the whole change from #283 and just keep the status quo (ie, what's actually tested and known to be working as well as 1.2 was) for 1.3, and then discuss more complex/"magic" logic for 1.4. Fair?

[bfirsh]

+1 not changing anything at this stage

[SvenDowideit]

+1 to punting to 1.4!