[tor-commits] [arm/release] Removing the INCLUDE_GUI source flag
atagar at torproject.org
atagar at torproject.org
Sun Jul 17 06:08:33 UTC 2011
commit 52852efe54e134a7fb471e5d8c89d4ee90f3ec75
Author: Damian Johnson <atagar at torproject.org>
Date: Thu Jul 14 17:49:19 2011 -0700
Removing the INCLUDE_GUI source flag
It's still pretty rough but ready for some initial input. The header (renamed
(as sticky), log, bandwidth graphs, and connection panels have all been
implemented by Kamran.
---
src/starter.py | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/starter.py b/src/starter.py
index 0564661..01acf24 100644
--- a/src/starter.py
+++ b/src/starter.py
@@ -30,7 +30,6 @@ import util.uiTools
import TorCtl.TorCtl
import TorCtl.TorUtil
-INCLUDE_GUI = True
LOG_DUMP_PATH = os.path.expanduser("~/.arm/log")
DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc")
CONFIG = {"startup.controlPassword": None,
@@ -53,12 +52,8 @@ CONFIG = {"startup.controlPassword": None,
"log.configDescriptions.persistance.saveFailed": util.log.NOTICE,
"log.savingDebugLog": util.log.NOTICE}
-if INCLUDE_GUI:
- OPT = "gi:c:dbe:vh"
- OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"]
-else:
- OPT = "i:c:dbe:vh"
- OPT_EXPANDED = ["interface=", "config=", "debug", "blind", "event=", "version", "help"]
+OPT = "gi:c:dbe:vh"
+OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"]
HELP_MSG = """Usage arm [OPTION]
Terminal status monitor for Tor relays.
@@ -79,11 +74,6 @@ arm -b -i 1643 hide connection data, attaching to control port 1643
arm -e we -c /tmp/cfg use this configuration file with 'WARN'/'ERR' events
""" % (CONFIG["startup.interface.ipAddress"], CONFIG["startup.interface.port"], DEFAULT_CONFIG, LOG_DUMP_PATH, CONFIG["startup.events"], cli.logPanel.EVENT_LISTING)
-# icky and temporary hack to remove the gui help option if it's unavailbe
-if not INCLUDE_GUI:
- helpComp = HELP_MSG.split("\n")
- HELP_MSG = "\n".join(helpComp[:3] + helpComp[4:])
-
# filename used for cached tor config descriptions
CONFIG_DESC_FILENAME = "torConfigDesc.txt"
@@ -310,7 +300,7 @@ if __name__ == '__main__':
param["startup.interface.ipAddress"] = controlAddr
param["startup.interface.port"] = controlPort
- elif opt in ("-g", "--gui") and INCLUDE_GUI: launchGui = True
+ elif opt in ("-g", "--gui"): launchGui = True
elif opt in ("-c", "--config"): configPath = arg # sets path of user's config
elif opt in ("-d", "--debug"): isDebugMode = True # dumps all logs
elif opt in ("-b", "--blind"):
More information about the tor-commits
mailing list