From 6ebbb58a80ab24e7bcf2b97f270e68afb28f8ddf Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 3 Jun 2015 10:23:52 -0700
Subject: [PATCH] Log message about --one being removed

---
 atom.sh                 | 6 +++---
 src/browser/main.coffee | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/atom.sh b/atom.sh
index ecd7da052..460fdd2a8 100755
--- a/atom.sh
+++ b/atom.sh
@@ -11,14 +11,14 @@ else
   exit 1
 fi
 
-while getopts ":wtfvh-:" opt; do
+while getopts ":wtfvh1-:" opt; do
   case "$opt" in
     -)
       case "${OPTARG}" in
         wait)
           WAIT=1
           ;;
-        help|version)
+        help|version|one)
           REDIRECT_STDERR=1
           EXPECT_OUTPUT=1
           ;;
@@ -30,7 +30,7 @@ while getopts ":wtfvh-:" opt; do
     w)
       WAIT=1
       ;;
-    h|v)
+    h|v|1)
       REDIRECT_STDERR=1
       EXPECT_OUTPUT=1
       ;;
diff --git a/src/browser/main.coffee b/src/browser/main.coffee
index 5cf412808..ac6a8e6e0 100644
--- a/src/browser/main.coffee
+++ b/src/browser/main.coffee
@@ -121,8 +121,16 @@ parseCommandLine = ->
   options.alias('v', 'version').boolean('v').describe('v', 'Print the version.')
   options.alias('w', 'wait').boolean('w').describe('w', 'Wait for window to be closed before returning.')
   options.string('socket-path')
+  options.alias('1', 'one').boolean('one') # Deprecated 1.0 API preview flag
   args = options.argv
 
+  if args.one
+    process.stdout.write """
+      The -1/--one option has been removed. Atom now defaults to launching with
+      the 1.0 API. Use --include-deprecated-apis to run Atom with deprecated APIs.
+
+    """
+
   if args.help
     process.stdout.write(options.help())
     process.exit(0)