Merge branch 'dev'

Author: rimusz

src/CoreOS Cluster GUI/AppDelegate.m

@@ -34,10 +34,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
     }
     else
     {
- //       NSString *msg = [NSString stringWithFormat:@"%@ ", @"CoreOS-Vagrant Cluster was not set, run from menu 'Setup' - 'Initial setup of CoreOS-Vagrant Cluster' !!! "];
- //       [self displayWithMessage:@"CoreOS-Vagrant Cluster" infoText:msg];
-        
-        NSAlert *alert = [[NSAlert alloc] init];
+         NSAlert *alert = [[NSAlert alloc] init];
         [alert addButtonWithTitle:@"OK"];
         [alert addButtonWithTitle:@"Cancel"];
         [alert setMessageText:@"CoreOS-Vagrant Cluster was not set."];
@@ -69,7 +66,7 @@ - (IBAction)Start:(id)sender {
     {
         // send a notification on to the screen
         NSUserNotification *notification = [[NSUserNotification alloc] init];
-        notification.title = @"coreos-vagrant cluster will be up shortly";
+        notification.title = @"CoreOS-Vagrant Cluster will be up shortly";
         notification.informativeText = @"and OS shell will be opened";
         [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
 

src/CoreOS Cluster GUI/CoreOS Cluster GUI-Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.2</string>
+	<string>0.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>57</string>
+	<string>61</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/coreos-vagrant-install.command

@@ -13,34 +13,18 @@
     mkdir ~/coreos-osx-cluster/bin
     mkdir ~/coreos-osx-cluster/fleet
 
-    # download latest coreos-vagrant
-    git clone https://github.com/coreos/coreos-vagrant/ ~/coreos-osx-cluster/github
-
     # cd to App's Resources folder
     cd "$1"
 
     # copy gsed to ~/coreos-osx-cluster/bin
     cp "$1"/gsed ~/coreos-osx-cluster/bin
+    chmod 755 ~/coreos-osx-cluster/bin/gsed
 
+    # copy files to ~/coreos-osx-cluster/tmp for later use of first-init.command
     # Vagrantfile
-    cp ~/coreos-osx-cluster/github/Vagrantfile ~/coreos-osx-cluster/coreos-vagrant/Vagrantfile
-    # chnage VM names to corec-..
-    sed -i "" 's/core-%02d/corec-%02d/' ~/coreos-osx-cluster/coreos-vagrant/Vagrantfile
-    # change network subnet
-    sed -i "" 's/172.17.8.#{i+100}/172.17.9.#{i+100}/g' ~/coreos-osx-cluster/coreos-vagrant/Vagrantfile
-    # change corec-01 host ssh port forward
     cp "$1"/Vagrantfile ~/coreos-osx-cluster/tmp/Vagrantfile
-    "$1"/gsed -i "/#config.vm.synced_folder/r $HOME/coreos-osx-cluster/tmp/Vagrantfile" ~/coreos-osx-cluster/coreos-vagrant/Vagrantfile
-    rm -f ~/coreos-osx-cluster/tmp/Vagrantfile
-
     # config.rb file
-    # enable discovery setup
-    cat "$1"/config.rb ~/coreos-osx-cluster/github/config.rb.sample > ~/coreos-osx-cluster/coreos-vagrant/config.rb
-    # set a size of the CoreOS cluster created by Vagrant to 3
-    sed -i "" 's/#$num_instances=1/$num_instances=3/' ~/coreos-osx-cluster/coreos-vagrant/config.rb
-
-    # user-data file
-    cp ~/coreos-osx-cluster/github/user-data.sample ~/coreos-osx-cluster/coreos-vagrant/user-data
+    cp "$1"/config.rb ~/coreos-osx-cluster/tmp/config.rb
 
     # initial init
     open -a iTerm.app "$1"/first-init.command

src/first-init.command

@@ -6,13 +6,41 @@
 #  Created by Rimantas on 01/04/2014.
 #  Copyright (c) 2014 Rimantas Mocevicius. All rights reserved.
 
+### getting files from github and setting them up
+    echo ""
+    echo "Downloading latest coreos-vagrant files from github: "
+    git clone https://github.com/coreos/coreos-vagrant/ ~/coreos-osx-cluster/github
+    echo "Done downloading from github !!!"
+    echo ""
+
+    # Vagrantfile
+    cp ~/coreos-osx-cluster/github/Vagrantfile ~/coreos-osx-cluster/coreos-vagrant/Vagrantfile
+    # change VM names to corec-..
+    sed -i "" 's/core-%02d/corec-%02d/' ~/coreos-osx-cluster/coreos-vagrant/Vagrantfile
+    # change network subnet
+    sed -i "" 's/172.17.8.#{i+100}/172.17.9.#{i+100}/g' ~/coreos-osx-cluster/coreos-vagrant/Vagrantfile
+    # change corec-01 host ssh port forward
+    ~/coreos-osx-cluster/bin/gsed -i "/#config.vm.synced_folder/r $HOME/coreos-osx-cluster/tmp/Vagrantfile" ~/coreos-osx-cluster/coreos-vagrant/Vagrantfile
+    rm -f ~/coreos-osx-cluster/tmp/Vagrantfile
+
+    # config.rb file
+    # enable discovery setup
+    cat ~/coreos-osx-cluster/tmp/config.rb ~/coreos-osx-cluster/github/config.rb.sample > ~/coreos-osx-cluster/coreos-vagrant/config.rb
+    # set a size of the CoreOS cluster created by Vagrant to 3
+    sed -i "" 's/#$num_instances=1/$num_instances=3/' ~/coreos-osx-cluster/coreos-vagrant/config.rb
+    rm -f ~/coreos-osx-cluster/tmp/config.rb
+
+    # user-data file
+    cp ~/coreos-osx-cluster/github/user-data.sample ~/coreos-osx-cluster/coreos-vagrant/user-data
+###
+
 ### Set release channel
 LOOP=1
 while [ $LOOP -gt 0 ]
 do
     VALID_MAIN=0
     echo " "
-    echo " CoreOS Release Channel:"
+    echo "Set CoreOS Release Channel:"
     echo " 1)  Alpha "
     echo " 2)  Beta "
     echo " 3)  Stable "