Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
aaPanel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
aaPanel
Commits
d23e28ff
Commit
d23e28ff
authored
Jun 26, 2019
by
jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed an issue where the node was not automatically selected when installing the plugin
parent
0e61b090
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
panelPlugin.py
class/panelPlugin.py
+3
-4
No files found.
class/panelPlugin.py
View file @
d23e28ff
...
...
@@ -156,14 +156,12 @@ class panelPlugin:
if
not
os
.
path
.
exists
(
tmp_path
):
os
.
makedirs
(
tmp_path
,
mode
=
384
);
toFile
=
tmp_path
+
'/'
+
pluginInfo
[
'name'
]
+
'.zip'
public
.
downloadFile
(
'http://www.bt.cn/api/Pluginother/get_file?fname='
+
pluginInfo
[
'versions'
][
0
][
'download'
],
toFile
)
if
public
.
FileMd5
(
toFile
)
!=
pluginInfo
[
'versions'
][
0
][
'md5'
]:
return
public
.
returnMsg
(
False
,
'CHECK_FILE_HASH'
)
update
=
False
;
if
os
.
path
.
exists
(
pluginInfo
[
'install_checks'
]):
update
=
pluginInfo
[
'versions'
][
0
][
'version_msg'
]
return
self
.
update_zip
(
None
,
toFile
,
update
);
else
:
if
not
'download_url'
in
session
:
session
[
'download_url'
]
=
'http://download.bt.cn'
;
download_url
=
session
[
'download_url'
]
+
'/install/plugin/'
+
pluginInfo
[
'name'
]
+
'/install.sh'
;
download_url
=
public
.
get_url
()
+
'/install/plugin/'
+
pluginInfo
[
'name'
]
+
'/install.sh'
;
toFile
=
'/tmp/
%
s.sh'
%
pluginInfo
[
'name'
]
public
.
downloadFile
(
download_url
,
toFile
);
os
.
system
(
'/bin/bash '
+
toFile
+
' install > /tmp/panelShell.pl'
);
...
...
@@ -604,8 +602,9 @@ class panelPlugin:
self
.
get_icon
(
softInfo
[
'name'
])
if
softInfo
[
'name'
]
.
find
(
'php-'
)
!=
-
1
:
v2
=
softInfo
[
'versions'
][
0
][
'm_version'
]
.
replace
(
'.'
,
''
)
softInfo
[
'fpm'
]
=
os
.
path
.
exists
(
'/
etc/init.d/php-fpm-'
+
v2
)
softInfo
[
'fpm'
]
=
os
.
path
.
exists
(
'/
www/server/php/'
+
v2
+
'/sbin/php-fpm'
)
softInfo
[
'status'
]
=
os
.
path
.
exists
(
'/tmp/php-cgi-'
+
v2
+
'.sock'
)
if
not
softInfo
[
'fpm'
]:
softInfo
[
'status'
]
=
True
if
softInfo
[
'name'
]
==
'mysql'
:
softInfo
[
'status'
]
=
self
.
process_exists
(
'mysqld'
)
if
softInfo
[
'name'
]
==
'phpmyadmin'
:
softInfo
[
'status'
]
=
self
.
get_phpmyadmin_stat
()
return
softInfo
...
...
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