Merge branch 'dev'

TheNewNormal · Feb 10, 2015 · fd8e8b4 · fd8e8b4
2 parents 4c450df + 013e4ec
commit fd8e8b4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ How to install
 
 Required software
 * [VirtualBox for Mac OS X hosts](https://www.virtualbox.org/wiki/Downloads), [Vagrant for Mac OS X](http://www.vagrantup.com/downloads.html) and [iTerm 2](http://www.iterm2.com/#/section/downloads)
-* Download `CoreOS Vagrant OSX GUI latest.zip` from the [Releases Page](https://github.com/rimusz/coreos-osx-gui/releases) and unzip it.
+* Download `CoreOS Vagrant OSX GUI latest.dmg` from the [Releases Page](https://github.com/rimusz/coreos-osx-gui/releases) and open it and drag the App e.g to your Desktop.
 * Start the `CoreOS Vagrant OSX GUI` and from menu `Setup` choose `Initial setup of CoreOS-Vagrant` 
 * The install will do the following:
 ````

diff --git a/src/CoreOS GUI/Base.lproj/MainMenu.xib b/src/CoreOS GUI/Base.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7515.2" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7515.2"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -708,7 +708,7 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Updates" id="DFA-8C-ne3">
                         <items>
-                            <menuItem title="Check for updates" id="sEE-aC-0Ob">
+                            <menuItem title="Check updates for vbox, fleetctl, etcdctl, docker and rocket" id="sEE-aC-0Ob">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="updates:" target="494" id="3Va-Du-QFm"/>

diff --git a/src/CoreOS GUI/CoreOS GUI-Info.plist b/src/CoreOS GUI/CoreOS GUI-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.5</string>
+	<string>0.7.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>300</string>
+	<string>305</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/first-init.command b/src/first-init.command
@@ -152,7 +152,7 @@ ROCKET_RELEASE=$(curl 'https://api.github.com/repos/coreos/rocket/releases' 2>/d
 echo "Downloading Rocket $ROCKET_RELEASE"
 vagrant ssh -c 'sudo mkdir -p /opt/bin && sudo chmod -R 777 /opt/bin && cd /home/core && \
 curl -L -o rocket.tar.gz "https://github.com/coreos/rocket/releases/download/'$ROCKET_RELEASE'/rocket-'$ROCKET_RELEASE'.tar.gz" && \
-tar xzvf rocket.tar.gz && cp -f rocket-'$ROCKET_RELEASE'/* /opt/bin && sudo chmod 777 /opt/bin/rkt && rkt version && \
+tar xzvf rocket.tar.gz && cp -f rocket-'$ROCKET_RELEASE'/* /opt/bin && sudo chmod 777 /opt/bin/rkt && /opt/bin/rkt version && \
 rm -fr rocket-'$ROCKET_RELEASE' && rm -f rocket.tar.gz'
 echo " "
 

diff --git a/src/update.command b/src/update.command
@@ -10,6 +10,16 @@ function pause(){
 read -p "$*"
 }
 
+# cd to App's Resources folder and copy some files
+cd "$1"
+# copy fleet units
+cp -fr "$1"/*.service ~/coreos-osx/fleet/
+# copy gsed to ~/coreos-osx/bin
+cp -f "$1"/gsed ~/coreos-osx/bin
+# copy rkt to ~/coreos-osx/bin
+cp -f "$1"/rkt ~/coreos-osx/bin
+
+#
 cd ~/coreos-osx/coreos-vagrant
 vagrant box update
 vagrant up
@@ -26,7 +36,7 @@ echo "Downloading Rocket $ROCKET_RELEASE"
 
 vagrant ssh -c 'sudo mkdir -p /opt/bin && sudo chmod -R 777 /opt/bin && cd /home/core && \
 curl -L -o rocket.tar.gz "https://github.com/coreos/rocket/releases/download/'$ROCKET_RELEASE'/rocket-'$ROCKET_RELEASE'.tar.gz" && \
-tar xzvf rocket.tar.gz && cp -f rocket-'$ROCKET_RELEASE'/* /opt/bin && sudo chmod 777 /opt/bin/rkt && rkt version && \
+tar xzvf rocket.tar.gz && cp -f rocket-'$ROCKET_RELEASE'/* /opt/bin && sudo chmod 777 /opt/bin/rkt && /opt/bin/rkt version && \
 rm -fr rocket-'$ROCKET_RELEASE' && rm -f rocket.tar.gz'
 echo " "