From d41c761e022ef9858c34edae9850611215665029 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Sat, 12 Aug 2006 19:34:06 +0000
Subject: Simplify profile/nick name code. Use SUGAR_NICK_NAME env.

---
(limited to 'shell')

diff --git a/shell/session/Session.py b/shell/session/Session.py
index 578fe72..de6b514 100644
--- a/shell/session/Session.py
+++ b/shell/session/Session.py
@@ -71,7 +71,7 @@ class Session:
 		process.start()
 
 		console = ConsoleWindow()
-		sugar.logger.start('Shell', console)
+		#sugar.logger.start('Shell', console)
 
 		process = MatchboxProcess()
 		process.start()
diff --git a/shell/sugar b/shell/sugar
index 42de27e..16744cc 100755
--- a/shell/sugar
+++ b/shell/sugar
@@ -24,22 +24,6 @@ def add_to_python_path(path):
 	else:
 		os.environ['PYTHONPATH'] = path
 
-i = 0
-for arg in sys.argv:
-	if arg == '--test-user':
-		user = sys.argv[i + 1]
-		user_dir = os.path.expanduser('~/.sugar-' + user)
-		os.environ['SUGAR_NICK_NAME'] = user
-		os.environ['SUGAR_USER_DIR'] = user_dir
-	i += 1
-
-if not os.environ.has_key("SUGAR_NICK_NAME"):
-	nick = pwd.getpwuid(os.getuid())[0]
-	if not nick or not len(nick):
-		nick = "Guest %d" % random.randint(1, 10000)
-	os.environ['SUGAR_NICK_NAME'] = nick
-	os.environ['SUGAR_USER_DIR'] = os.path.expanduser('~/.sugar')
-
 curdir = os.path.abspath(os.path.dirname(__file__))
 basedir = os.path.dirname(curdir)
 
--
cgit v0.9.1