Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
client
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
2
Merge Requests
0
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
5c10fbda
authored
Jun 24, 2015
by
Csók Tamás
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
client: accent corrections
parent
6f2b7aef
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
src/nsi/installer/cloud_connect_from_windows.py
+4
-4
src/nsi/installer/win_install.py
+1
-1
No files found.
src/nsi/installer/cloud_connect_from_windows.py
View file @
5c10fbda
...
@@ -41,9 +41,9 @@ def connect(vm):
...
@@ -41,9 +41,9 @@ def connect(vm):
'user'
:
vm
.
user
,
'user'
:
vm
.
user
,
'host'
:
vm
.
host
})
'host'
:
vm
.
host
})
directory
=
os
.
path
.
dirname
(
os
.
path
.
abspath
(
__file__
))
directory
=
os
.
path
.
dirname
(
os
.
path
.
abspath
(
__file__
))
logger
.
debug
(
'Popen:
%
s
\\
putty.exe
'
,
directory
)
logger
.
debug
(
'Popen:
"
%
s
\\
putty.exe"
'
,
directory
)
logger
.
info
(
'Determined arguments:
%
s'
,
arguments
)
logger
.
info
(
'Determined arguments:
%
s'
,
arguments
)
subprocess
.
Popen
(
"
%(path)
s
\\
putty.exe
%(arguments)
s"
%
{
subprocess
.
Popen
(
'"
%(path)
s
\\
putty.exe"
%(arguments)
s'
%
{
'path'
:
directory
,
'path'
:
directory
,
'arguments'
:
arguments
},
shell
=
True
)
'arguments'
:
arguments
},
shell
=
True
)
elif
vm
.
protocol
==
"NX"
:
elif
vm
.
protocol
==
"NX"
:
...
@@ -71,7 +71,7 @@ def connect(vm):
...
@@ -71,7 +71,7 @@ def connect(vm):
f
.
close
()
f
.
close
()
logger
.
info
(
'Config file created:
%
s'
,
config_file
)
logger
.
info
(
'Config file created:
%
s'
,
config_file
)
logger
.
debug
(
'Popen the config file:
%
s'
,
config_file
)
logger
.
debug
(
'Popen the config file:
%
s'
,
config_file
)
subprocess
.
Popen
(
config_file
,
shell
=
True
)
subprocess
.
Popen
(
'"
%
s"'
%
config_file
,
shell
=
True
)
elif
vm
.
protocol
==
"RDP"
:
elif
vm
.
protocol
==
"RDP"
:
logger
.
debug
(
'NX protocol received'
)
logger
.
debug
(
'NX protocol received'
)
listdir
=
ClientRegistry
.
directory
()
+
"
\\
.rdp
\\
*.rdp"
listdir
=
ClientRegistry
.
directory
()
+
"
\\
.rdp
\\
*.rdp"
...
@@ -99,7 +99,7 @@ def connect(vm):
...
@@ -99,7 +99,7 @@ def connect(vm):
f
.
close
()
f
.
close
()
logger
.
info
(
'Config file created:
%
s'
,
config_file
)
logger
.
info
(
'Config file created:
%
s'
,
config_file
)
logger
.
debug
(
'Popen the config file:
%
s'
,
config_file
)
logger
.
debug
(
'Popen the config file:
%
s'
,
config_file
)
subprocess
.
Popen
(
config_file
,
shell
=
True
)
subprocess
.
Popen
(
'"
%
s"'
%
config_file
,
shell
=
True
)
logger
.
info
(
'Client finished working'
)
logger
.
info
(
'Client finished working'
)
NX_template
=
"""<!DOCTYPE NXClientSettings>
NX_template
=
"""<!DOCTYPE NXClientSettings>
...
...
src/nsi/installer/win_install.py
View file @
5c10fbda
...
@@ -133,7 +133,7 @@ def main():
...
@@ -133,7 +133,7 @@ def main():
if
args
.
nx
:
if
args
.
nx
:
print
"Running NX Client install"
print
"Running NX Client install"
subprocess
.
call
(
subprocess
.
call
(
"python
%
s
\\
nx_client_installer.py"
%
os
.
path
.
dirname
(
'python "
%
s
\\
nx_client_installer.py"'
%
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
)))
os
.
path
.
realpath
(
__file__
)))
print
"Creating icon in the installation folder"
print
"Creating icon in the installation folder"
location
=
os
.
path
.
join
(
desktop_path
,
"CIRCLE Client.url"
)
location
=
os
.
path
.
join
(
desktop_path
,
"CIRCLE Client.url"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment