Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #135 from abbaselmas/patch-2

Browse Source 
netdata uninstall not work
This commit is contained in:
VirtuBox
2019-09-01 23:33:19 +02:00
committed by GitHub
parent e7ade16d78 34ec2508a6
commit 994306299c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wo/cli/plugins/stack.py
View File

@@ -644,7 +644,7 @@ class WOStackController(CementBaseController):
if pargs.netdata: if pargs.netdata:
Log.debug(self, "Removing Netdata") Log.debug(self, "Removing Netdata")
if os.path.isfile('/opt/netdata/usr/' if os.path.isfile('/opt/netdata/usr/'
'libexec/netdata-uninstaller.sh'): 'libexec/netdata/netdata-uninstaller.sh'):
packages = packages + ['/var/lib/wo/tmp/kickstart.sh'] packages = packages + ['/var/lib/wo/tmp/kickstart.sh']
if pargs.dashboard: if pargs.dashboard:
@@ -672,12 +672,12 @@ class WOStackController(CementBaseController):
'kickstart.sh']).issubset(set(packages))): 'kickstart.sh']).issubset(set(packages))):
if WOVariables.wo_distro == 'Raspbian': if WOVariables.wo_distro == 'Raspbian':
WOShellExec.cmd_exec(self, "bash /usr/" WOShellExec.cmd_exec(self, "bash /usr/"
"libexec/netdata-" "libexec/netdata/"
"uninstaller.sh -y -f") "netdata-uninstaller.sh -y -f")
else: else:
WOShellExec.cmd_exec(self, "bash /opt/netdata/usr/" WOShellExec.cmd_exec(self, "bash /opt/netdata/usr/"
"libexec/netdata-" "libexec/netdata/"
"uninstaller.sh -y -f") "netdata-uninstaller.sh -y -f")
if (packages): if (packages):
Log.info(self, "Removing packages, please wait...") Log.info(self, "Removing packages, please wait...")
@@ -853,7 +853,7 @@ class WOStackController(CementBaseController):
if pargs.netdata: if pargs.netdata:
Log.debug(self, "Removing Netdata") Log.debug(self, "Removing Netdata")
if os.path.isfile('/opt/netdata/usr/' if os.path.isfile('/opt/netdata/usr/'
'libexec/netdata-uninstaller.sh'): 'libexec/netdata/netdata-uninstaller.sh'):
packages = packages + ['/var/lib/wo/tmp/kickstart.sh'] packages = packages + ['/var/lib/wo/tmp/kickstart.sh']
if pargs.dashboard: if pargs.dashboard: