From 61944b7a2c2cc91234b5154570015e153ee8c13b Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Tue, 17 Feb 2015 16:09:43 -0800
Subject: [PATCH 1/2] Fix flash of big image

---
 __tests__/util/reset |  6 ++++--
 src/Setup.react.js   |  4 ++--
 src/SetupStore.js    | 10 +++++++---
 styles/setup.less    |  5 +++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/__tests__/util/reset b/__tests__/util/reset
index 01f01d5bad..8008f16873 100755
--- a/__tests__/util/reset
+++ b/__tests__/util/reset
@@ -2,9 +2,11 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+sudo rm -f /usr/local/bin/docker
+sudo rm -f /usr/local/bin/boot2docker
 rm -rf ~/Library/Application\ Support/Kitematic/
+rm -rf ~/.boot2docker
+rm -rf ~/VirtualBox\ VMs/boot2docker-vm
 pkill VBox
 pkill VirtualBox
 $DIR/VirtualBox_Uninstall.tool
-rm -rf ~/.boot2docker
-rm -rf ~/VirtualBox\ VMs/boot2docker-vm
diff --git a/src/Setup.react.js b/src/Setup.react.js
index 2e19bc9677..9189d7cd80 100644
--- a/src/Setup.react.js
+++ b/src/Setup.react.js
@@ -48,7 +48,7 @@ var Setup = React.createClass({
     }
     return (
       <div className="contents">
-        <RetinaImage src={img}/>
+        <RetinaImage src={img} checkIfRetinaImgExists={false}/>
         <div className="detail">
           <Radial progress={SetupStore.percent()} thick={true} gray={true}/>
         </div>
@@ -97,7 +97,7 @@ var Setup = React.createClass({
         <Header />
         <div className="image">
           <div className="contents">
-            <RetinaImage img src="install-error.png"/>
+            <RetinaImage src="install-error.png" checkIfRetinaImgExists={false}/>
             <div className="detail">
             </div>
           </div>
diff --git a/src/SetupStore.js b/src/SetupStore.js
index e7f8dcbc6c..73923a7312 100644
--- a/src/SetupStore.js
+++ b/src/SetupStore.js
@@ -40,6 +40,10 @@ var _steps = [{
     if (!virtualBox.installed() || setupUtil.compareVersions(yield virtualBox.version(), packagejson['virtualbox-required-version']) < 0) {
       yield virtualBox.killall();
       cmd += ' && ' + setupUtil.installVirtualBoxCmd();
+    } else {
+      if (!setupUtil.needsBinaryFix()) {
+        return;
+      }
     }
     try {
       progressCallback(50); // TODO: detect when the installation has started so we can simulate progress
@@ -139,7 +143,7 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), {
     var required = {};
     var vboxfile = path.join(util.supportDir(), packagejson['virtualbox-filename']);
     required.download = !virtualBox.installed() && (!fs.existsSync(vboxfile) || setupUtil.checksum(vboxfile) !== packagejson['virtualbox-checksum']);
-    required.install = !virtualBox.installed() || setupUtil.needsBinaryFix();
+    required.install = !virtualBox.installed() || setupUtil.needsBinaryFix() || setupUtil.compareVersions(yield virtualBox.version(), packagejson['virtualbox-required-version']) < 0;
     required.init = !(yield boot2docker.exists()) || !isoversion || setupUtil.compareVersions(isoversion, boot2docker.version()) < 0;
     required.start = required.init || (yield boot2docker.status()) !== 'running';
 
@@ -181,9 +185,9 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), {
           step.percent = 100;
           break;
         } catch (err) {
+          console.log('Setup encountered an error.');
+          console.log(err);
           if (err) {
-            console.log(err);
-            console.log(err.stack);
             _error = err;
             this.emit(this.ERROR_EVENT);
           } else {
diff --git a/styles/setup.less b/styles/setup.less
index 5877f31cc9..35a5c7f674 100644
--- a/styles/setup.less
+++ b/styles/setup.less
@@ -15,6 +15,11 @@
     padding-right: 40px;
     padding-left: 80px;
 
+    img {
+      width: 399px;
+      height: 340px;
+    }
+
     .contents {
       position: relative;
       .detail {

From e8f62ab4d3d35f7fca3bad39aded89cc58849a46 Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Tue, 17 Feb 2015 16:14:43 -0800
Subject: [PATCH 2/2] Hiding horizontal scrollbar

---
 __tests__/util/reset   | 1 +
 styles/containers.less | 1 +
 2 files changed, 2 insertions(+)

diff --git a/__tests__/util/reset b/__tests__/util/reset
index 8008f16873..ca8de23bde 100755
--- a/__tests__/util/reset
+++ b/__tests__/util/reset
@@ -7,6 +7,7 @@ sudo rm -f /usr/local/bin/boot2docker
 rm -rf ~/Library/Application\ Support/Kitematic/
 rm -rf ~/.boot2docker
 rm -rf ~/VirtualBox\ VMs/boot2docker-vm
+rm -rf ~/Library/VirtualBox/
 pkill VBox
 pkill VirtualBox
 $DIR/VirtualBox_Uninstall.tool
diff --git a/styles/containers.less b/styles/containers.less
index 5960529d93..6ffb2d470d 100644
--- a/styles/containers.less
+++ b/styles/containers.less
@@ -829,6 +829,7 @@
                 white-space: pre;
                 .logs {
                   overflow: auto;
+                  overflow-x: hidden;
                   height: 100%;
                 }
                 p {