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
bf079525
authored
Sep 03, 2014
by
Csók Tamás
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
client: custom urls got circle: prefix
parent
0f004e30
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
62 deletions
+18
-62
src/iss/installer/cloud.py
+2
-2
src/iss/installer/win_install.py
+7
-29
src/python/cloud.py
+2
-2
src/python/win_install.py
+7
-29
No files found.
src/iss/installer/cloud.py
View file @
bf079525
...
...
@@ -141,8 +141,8 @@ def main():
args
=
parse_arguments
()
if
args
.
uri
is
not
None
:
vm
=
Struct
()
vm
.
protocol
,
vm
.
user
,
vm
.
password
,
vm
.
host
,
vm
.
port
=
\
args
.
uri
.
split
(
':'
,
4
)
x
,
vm
.
protocol
,
vm
.
user
,
vm
.
password
,
vm
.
host
,
vm
.
port
=
\
args
.
uri
.
split
(
':'
,
5
)
vm
.
protocol
=
vm
.
protocol
.
upper
()
vm
.
state
=
"RUN"
else
:
...
...
src/iss/installer/win_install.py
View file @
bf079525
...
...
@@ -136,39 +136,17 @@ def main():
shutil
.
copy
(
location
,
args
.
location
)
print
"Creating custom URL protocol handlers"
try
:
custom_
ssh
=
OrderedDict
([
(
'
ssh
'
,
[
"default"
,
"URL:
ssh
Protocol"
,
custom_
protocol
=
OrderedDict
([
(
'
circle
'
,
[
"default"
,
"URL:
circle
Protocol"
,
"URL Protocol"
,
""
]),
(
'
ssh
\\
URL Protocol'
,
""
),
(
'
ssh
\\
DefaultIcon'
,
args
.
location
+
"cloud.ico"
),
(
'
ssh
\\
shell'
,
{
'open'
:
{
(
'
circle
\\
URL Protocol'
,
""
),
(
'
circle
\\
DefaultIcon'
,
args
.
location
+
"cloud.ico"
),
(
'
circle
\\
shell'
,
{
'open'
:
{
'command'
:
"
\"
pythonw.exe
\"
\"
%
s"
%
args
.
location
+
"cloud.py
\"
\"
%1
\"
"
}})])
custom_protocol_register
(
custom_ssh
)
custom_rdp
=
OrderedDict
([
(
'rdp'
,
[
"default"
,
"URL:rdp Protocol"
,
"URL Protocol"
,
""
]),
(
'rdp
\\
URL Protocol'
,
""
),
(
'rdp
\\
DefaultIcon'
,
args
.
location
+
"cloud.ico"
),
(
'rdp
\\
shell'
,
{
'open'
:
{
'command'
:
"
\"
pythonw.exe
\"
\"
%
s"
%
args
.
location
+
"cloud.py
\"
\"
%1
\"
"
}})])
custom_protocol_register
(
custom_rdp
)
custom_nx
=
OrderedDict
([
(
'nx'
,
[
"default"
,
"URL:nx Protocol"
,
"URL Protocol"
,
""
]),
(
'nx
\\
URL Protocol'
,
""
),
(
'nx
\\
DefaultIcon'
,
args
.
location
+
"cloud.ico"
),
(
'nx
\\
shell'
,
{
'open'
:
{
'command'
:
"
\"
pythonw.exe
\"
\"
%
s"
%
args
.
location
+
"cloud.py
\"
\"
%1
\"
"
}})])
custom_protocol_register
(
custom_nx
)
custom_protocol_register
(
custom_protocol
)
except
:
print
"Error! URL Protocol handler installation aborted!"
except
:
...
...
src/python/cloud.py
View file @
bf079525
...
...
@@ -141,8 +141,8 @@ def main():
args
=
parse_arguments
()
if
args
.
uri
is
not
None
:
vm
=
Struct
()
vm
.
protocol
,
vm
.
user
,
vm
.
password
,
vm
.
host
,
vm
.
port
=
\
args
.
uri
.
split
(
':'
,
4
)
x
,
vm
.
protocol
,
vm
.
user
,
vm
.
password
,
vm
.
host
,
vm
.
port
=
\
args
.
uri
.
split
(
':'
,
5
)
vm
.
protocol
=
vm
.
protocol
.
upper
()
vm
.
state
=
"RUN"
else
:
...
...
src/python/win_install.py
View file @
bf079525
...
...
@@ -136,39 +136,17 @@ def main():
shutil
.
copy
(
location
,
args
.
location
)
print
"Creating custom URL protocol handlers"
try
:
custom_
ssh
=
OrderedDict
([
(
'
ssh
'
,
[
"default"
,
"URL:
ssh
Protocol"
,
custom_
protocol
=
OrderedDict
([
(
'
circle
'
,
[
"default"
,
"URL:
circle
Protocol"
,
"URL Protocol"
,
""
]),
(
'
ssh
\\
URL Protocol'
,
""
),
(
'
ssh
\\
DefaultIcon'
,
args
.
location
+
"cloud.ico"
),
(
'
ssh
\\
shell'
,
{
'open'
:
{
(
'
circle
\\
URL Protocol'
,
""
),
(
'
circle
\\
DefaultIcon'
,
args
.
location
+
"cloud.ico"
),
(
'
circle
\\
shell'
,
{
'open'
:
{
'command'
:
"
\"
pythonw.exe
\"
\"
%
s"
%
args
.
location
+
"cloud.py
\"
\"
%1
\"
"
}})])
custom_protocol_register
(
custom_ssh
)
custom_rdp
=
OrderedDict
([
(
'rdp'
,
[
"default"
,
"URL:rdp Protocol"
,
"URL Protocol"
,
""
]),
(
'rdp
\\
URL Protocol'
,
""
),
(
'rdp
\\
DefaultIcon'
,
args
.
location
+
"cloud.ico"
),
(
'rdp
\\
shell'
,
{
'open'
:
{
'command'
:
"
\"
pythonw.exe
\"
\"
%
s"
%
args
.
location
+
"cloud.py
\"
\"
%1
\"
"
}})])
custom_protocol_register
(
custom_rdp
)
custom_nx
=
OrderedDict
([
(
'nx'
,
[
"default"
,
"URL:nx Protocol"
,
"URL Protocol"
,
""
]),
(
'nx
\\
URL Protocol'
,
""
),
(
'nx
\\
DefaultIcon'
,
args
.
location
+
"cloud.ico"
),
(
'nx
\\
shell'
,
{
'open'
:
{
'command'
:
"
\"
pythonw.exe
\"
\"
%
s"
%
args
.
location
+
"cloud.py
\"
\"
%1
\"
"
}})])
custom_protocol_register
(
custom_nx
)
custom_protocol_register
(
custom_protocol
)
except
:
print
"Error! URL Protocol handler installation aborted!"
except
:
...
...
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