diff options
| author | garykac@google.com <garykac@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 01:19:50 +0000 |
|---|---|---|
| committer | garykac@google.com <garykac@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 01:19:50 +0000 |
| commit | 65b6c1aa0dca8cace4a81b1c5eb787a7e937ff0f (patch) | |
| tree | 529226c8dae316507d82f3e390455668e719750b /remoting/tools | |
| parent | 4308801ad9a5d7bad08786754bdec70fae6fd6c9 (diff) | |
| download | chromium_src-65b6c1aa0dca8cace4a81b1c5eb787a7e937ff0f.zip chromium_src-65b6c1aa0dca8cace4a81b1c5eb787a7e937ff0f.tar.gz chromium_src-65b6c1aa0dca8cace4a81b1c5eb787a7e937ff0f.tar.bz2 | |
Fix host auth scripts to work with Windows.
Fix simple_host to work when \Users\<username> is on a different drive than the chrome repository.
BUG=none
TEST=run scripts & host process on Windows
Review URL: http://codereview.chromium.org/2822029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/tools')
| -rwxr-xr-x | remoting/tools/gettoken.py | 2 | ||||
| -rwxr-xr-x | remoting/tools/register_host.py | 8 | ||||
| -rwxr-xr-x | remoting/tools/runclient.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/remoting/tools/gettoken.py b/remoting/tools/gettoken.py index a4024d7..d066bb8 100755 --- a/remoting/tools/gettoken.py +++ b/remoting/tools/gettoken.py @@ -13,7 +13,7 @@ import urllib import gaia_auth -auth_filepath = os.path.join(os.getenv('HOME'), '.chromotingAuthToken') +auth_filepath = os.path.join(os.path.expanduser('~'), '.chromotingAuthToken') print "Email:", email = raw_input() diff --git a/remoting/tools/register_host.py b/remoting/tools/register_host.py index 11e5e4c..5518818 100755 --- a/remoting/tools/register_host.py +++ b/remoting/tools/register_host.py @@ -12,6 +12,7 @@ import os import urllib import urllib2 import uuid +import socket import sys import gaia_auth @@ -19,7 +20,8 @@ import gaia_auth server = 'www-googleapis-test.sandbox.google.com' url = 'http://' + server + '/chromoting/v1/@me/hosts' -settings_filepath = os.path.join(os.getenv('HOME'), '.ChromotingConfig.json') +settings_filepath = os.path.join(os.path.expanduser('~'), + '.ChromotingConfig.json') print "Email:", email = raw_input() @@ -30,9 +32,9 @@ xapi_token = xapi_auth.authenticate(email, password) host_id = str(uuid.uuid1()) print "HostId:", host_id -host_name = os.uname()[1] +host_name = socket.gethostname() print "HostName:", host_name -# TODO(sergeyu): Implement keypair generaion. +# TODO(sergeyu): Implement keypair generation. public_key = '123123' jingle_id = '' diff --git a/remoting/tools/runclient.py b/remoting/tools/runclient.py index 17ba8da..12a4c5f 100755 --- a/remoting/tools/runclient.py +++ b/remoting/tools/runclient.py @@ -11,7 +11,7 @@ import os import platform -auth_filepath = os.path.join(os.getenv('HOME'), '.chromotingAuthToken') +auth_filepath = os.path.join(os.path.expanduser('~'), '.chromotingAuthToken') script_path = os.path.dirname(__file__) if platform.system() == "Windows": |