From 8d5edd6a80d28b8421a1fded7e8d270921d6df48 Mon Sep 17 00:00:00 2001
From: Oliver Smith <oliver@kfs.org>
Date: Thu, 11 Dec 2014 18:55:00 -0800
Subject: [PATCH] "update" now defaults to "-G"

---
 CHANGES.txt            |  1 +
 commands/update_cmd.py | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d9304920..9e76acbe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 ==============================================================================
 
 v6.1.9 [wip]
+. (kfsone) "-G" is now the default for "update"
 . (kfsone) "--capacity" and "--ly-per" are now required "run" arguments
 . (kfsone) "local --ly=0" now works as expected
 . (kfsone) Tell the user when we rebulid the cache (-q to silence)
diff --git a/commands/update_cmd.py b/commands/update_cmd.py
index ef3ec85e..52a3fe59 100644
--- a/commands/update_cmd.py
+++ b/commands/update_cmd.py
@@ -7,6 +7,7 @@
 import cache
 import subprocess
 import os
+import sys
 import pathlib
 
 ######################################################################
@@ -382,18 +383,23 @@ def run(results, cmdenv, tdb):
     else:
         cmdenv.startStation = place
 
-    if cmdenv.gui:
+    if cmdenv.gui or (not cmdenv.editor and not cmdenv.editing):
+        if not cmdenv.quiet:
+            print(
+                    "NOTE:\n"
+                    ". The Update UI is still somewhat experimental.\n"
+                    ". Press CTRL-C here to abort editing, or else "
+                    "just close the window to save.\n"
+                    ". Use '-q' to hide this message,\n"
+                    ". '-F' to make the update window appear infront "
+                    "of Elite: Dangerous (Windowed),\n"
+                    ". '-A' to force all items to show if stuff is "
+                    "missing from a station.",
+                    file=sys.stderr
+            )
         guidedUpdate(tdb, cmdenv)
         return None
 
-    if not cmdenv.editor and not cmdenv.editing:
-        raise CommandLineError(
-                "The GUI for updates is currently experimental. "
-                "Either use one of the editors or specify the "
-                "--experimental-gui (--exp or -G for short) "
-                "flags.\n"
-        )
-
     if not cmdenv.quiet and cmdenv.supply:
         print("NOTE: '--supply' (-S) is deprecated.")