From db3018c698f68142abf190ee2537bbbd1e90e015 Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Wed, 24 Jun 2015 13:14:52 -0500
Subject: [PATCH] add application menu

---
 app/index.js | 19 +++++++++++++++----
 package.json | 10 +++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/index.js b/app/index.js
index 9ec0a02..537492c 100644
--- a/app/index.js
+++ b/app/index.js
@@ -12,17 +12,28 @@ var tray
 app.on('ready', function ready () {
   // start sbot
 	require('scuttlebot').init(config, function (err, sbot) {
+    // open the web app
+    shell.openExternal('http://localhost:8008')
+
+    // setup menu
+    Menu.setApplicationMenu(Menu.buildFromTemplate([{
+      label: 'Window',
+      submenu: [
+        { label: 'Open Web App', click: onopen },
+        { label: 'Quit', click: onquit }
+      ]
+    }]))
 
     // setup tray icon
     tray = new Tray(__dirname+'/icon.png')
-    var contextMenu = Menu.buildFromTemplate([
-      { label: 'Open App', click: onopen },
+    tray.setContextMenu(Menu.buildFromTemplate([
+      { label: 'Open Web App', click: onopen },
       { label: 'Quit', click: onquit }
-    ])
-    tray.setContextMenu(contextMenu)
+    ]))
     tray.setToolTip('Secure Scuttlebutt: Running on port 8008')
     tray.on('double-clicked', onopen)
 
+    // menu handlers
     function onopen () {
       shell.openExternal('http://localhost:8008')
     }
diff --git a/package.json b/package.json
index 86d00fb..e32a14a 100644
--- a/package.json
+++ b/package.json
@@ -5,13 +5,13 @@
   "main": "app/index.js",
   "scripts": {
     "start": "electron .",
-    "clean": "rm -rf ./dist",
-    "clean:osx": "rm -rf ./dist/osx",
-    "clean:win": "rm -rf ./dist/win",
+    "clean": "rm -Rf ./dist",
+    "clean:osx": "rm -Rf ./dist/osx",
+    "clean:win": "rm -Rf ./dist/win",
     "build": "npm run clean && npm run build:osx && npm run build:win",
     "build:icon": "./scripts/make-icns.sh assets/icon1024.png assets/osx/scuttlebot.icns",
-    "build:osx": "npm run clean:osx && electron-packager ./ \"Scuttlebot\" --out=dist/osx --platform=darwin --arch=x64 --ignore=node_modules/electron* --version=0.28.3 --icon=assets/osx/scuttlebot.icns",
-    "build:win": "npm run clean:win && electron-packager ./ \"Scuttlebot\" --out=dist/win --platform=win32 --arch=ia32 --ignore=node_modules/electron* --version=0.28.3 --icon=assets/win/scuttlebot.ico",
+    "build:osx": "electron-packager ./ \"Scuttlebot\" --out=dist/osx --platform=darwin --arch=x64 --ignore=node_modules/electron* --version=0.28.3 --icon=assets/osx/scuttlebot.icns",
+    "build:win": "electron-packager ./ \"Scuttlebot\" --out=dist/win --platform=win32 --arch=ia32 --ignore=node_modules/electron* --version=0.28.3 --icon=assets/win/scuttlebot.ico",
     "pack": "npm run pack:osx && npm run pack:win",
     "pack:osx": "electron-builder \"dist/osx/Scuttlebot.app\" --platform=osx --out=\"dist/osx\" --config=packager.json",
     "pack:win": "electron-builder \"dist/win/Scuttlebot-win32\" --platform=win --out=\"dist/win\" --config=packager.json"