From d52810959afcd44553a15fb06cfaecc7c6dedd04 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 26 Feb 2015 20:16:48 -0500 Subject: [PATCH] Fixing merges --- browser/main.js | 4 ---- gulpfile.js | 6 ------ src/ContainerDetailsSubheader.react.js | 4 ---- src/Main.js | 10 ---------- src/MenuTemplate.js | 5 ----- src/Util.js | 25 ------------------------- util/deps | 5 ----- 7 files changed, 59 deletions(-) diff --git a/browser/main.js b/browser/main.js index 8932413606..70bd78afcb 100644 --- a/browser/main.js +++ b/browser/main.js @@ -45,11 +45,7 @@ app.on('ready', function() { mainWindow.loadUrl(path.normalize('file://' + path.join(__dirname, '..', 'build/index.html'))); app.on('will-quit', function () { if (saveVMOnQuit) { -<<<<<<< HEAD exec('/usr/bin/VBoxManage controlvm dev savestate', function () {}); -======= - exec('/usr/bin/VBoxManage controlvm boot2docker-vm savestate', function () {}); ->>>>>>> master } }); } diff --git a/gulpfile.js b/gulpfile.js index c538e26cb9..9c97bf3b9f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -30,17 +30,11 @@ settings.beta = isBeta; var options = { dev: process.argv.indexOf('release') === -1, beta: isBeta, -<<<<<<< HEAD appFilename: isBeta ? 'Kitematic (Beta).app' : 'Kitematic.app', appName: isBeta ? 'Kitematic (Beta)' : 'Kitematic', name: 'Kitematic', icon: isBeta ? './util/kitematic-beta.icns' : './util/kitematic.icns', bundle: 'com.kitemaic.app' -======= - filename: isBeta ? 'Kitematic (Beta).app' : 'Kitematic.app', - name: isBeta ? 'Kitematic (Beta)' : 'Kitematic', - icon: isBeta ? './util/kitematic-beta.icns' : './util/kitematic.icns' ->>>>>>> master }; gulp.task('js', function () { diff --git a/src/ContainerDetailsSubheader.react.js b/src/ContainerDetailsSubheader.react.js index b26858f4ef..7ea6453a98 100644 --- a/src/ContainerDetailsSubheader.react.js +++ b/src/ContainerDetailsSubheader.react.js @@ -171,11 +171,7 @@ var ContainerDetailsSubheader = React.createClass({
-<<<<<<< HEAD - -=======
->>>>>>> master View
diff --git a/src/Main.js b/src/Main.js index 6e1803467c..944e374164 100644 --- a/src/Main.js +++ b/src/Main.js @@ -5,13 +5,8 @@ if (localStorage.getItem('settings.width') && localStorage.getItem('settings.hei } window.addEventListener('resize', function () { -<<<<<<< HEAD localStorage.setItem('settings.width', window.outerWidth); localStorage.setItem('settings.height', window.outerHeight); -======= - localStorage.setItem('settings.width', window.innerWidth); - localStorage.setItem('settings.height', window.innerHeight); ->>>>>>> master }); require.main.paths.splice(0, 0, process.env.NODE_PATH); @@ -87,13 +82,8 @@ setInterval(function () { }, 14400000); router.run(Handler => React.render(, document.body)); -<<<<<<< HEAD SetupStore.run().then(machine.info).then(machine => { docker.setup(machine.url, machine.name); -======= -SetupStore.run().then(boot2docker.ip).then(ip => { - docker.setHost(ip); ->>>>>>> master ContainerStore.init(function (err) { if (err) { console.log(err); } router.transitionTo('containers'); diff --git a/src/MenuTemplate.js b/src/MenuTemplate.js index d027109796..1f967083df 100644 --- a/src/MenuTemplate.js +++ b/src/MenuTemplate.js @@ -1,10 +1,5 @@ var remote = require('remote'); var app = remote.require('app'); -<<<<<<< HEAD -======= -var path = require('path'); -var docker = require('./Docker'); ->>>>>>> master var router = require('./Router'); var util = require('./Util'); var metrics = require('./Metrics'); diff --git a/src/Util.js b/src/Util.js index 265a496d4b..949ac410c5 100644 --- a/src/Util.js +++ b/src/Util.js @@ -35,30 +35,5 @@ module.exports = { packagejson: function () { return JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8')); }, -<<<<<<< HEAD -======= - copycmd: function (src, dest) { - return ['rm', '-f', dest, '&&', 'cp', src, dest]; - }, - copyBinariesCmd: function () { - var packagejson = this.packagejson(); - var cmd = ['mkdir', '-p', '/usr/local/bin']; - cmd.push('&&'); - cmd.push.apply(cmd, this.copycmd(this.escapePath(path.join(this.resourceDir(), 'boot2docker-' + packagejson['boot2docker-version'])), '/usr/local/bin/boot2docker')); - cmd.push('&&'); - cmd.push.apply(cmd, this.copycmd(this.escapePath(path.join(this.resourceDir(), 'docker-' + packagejson['docker-version'])), '/usr/local/bin/docker')); - return cmd.join(' '); - }, - fixBinariesCmd: function () { - var cmd = []; - cmd.push.apply(cmd, ['chown', `${process.getuid()}:${80}`, this.escapePath(path.join('/usr/local/bin', 'boot2docker'))]); - cmd.push('&&'); - cmd.push.apply(cmd, ['chown', `${process.getuid()}:${80}`, this.escapePath(path.join('/usr/local/bin', 'docker'))]); - return cmd.join(' '); - }, - escapePath: function (str) { - return str.replace(/ /g, '\\ ').replace(/\(/g, '\\(').replace(/\)/g, '\\)'); - }, ->>>>>>> master webPorts: ['80', '8000', '8080', '3000', '5000', '2368', '9200', '8983'] }; diff --git a/util/deps b/util/deps index 93bcb95677..7d7dff31d1 100755 --- a/util/deps +++ b/util/deps @@ -1,13 +1,8 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BASE=$DIR/.. -<<<<<<< HEAD:util/deps DOCKER_MACHINE_CLI_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-machine-version']" "$(cat $BASE/package.json)") DOCKER_MACHINE_CLI_FILE=docker-machine-$DOCKER_MACHINE_CLI_VERSION -======= -BOOT2DOCKER_CLI_VERSION=$(node -pe "JSON.parse(process.argv[1])['boot2docker-version']" "$(cat $BASE/package.json)") -BOOT2DOCKER_CLI_FILE=boot2docker-$BOOT2DOCKER_CLI_VERSION ->>>>>>> master:util/deps DOCKER_CLI_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-version']" "$(cat $BASE/package.json)") DOCKER_CLI_FILE=docker-$DOCKER_CLI_VERSION