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

Merge branch 'master' into updating-configuration

Browse Source
This commit is contained in:
VirtuBox
2019-09-01 23:34:03 +02:00
parent e4f686a9f4 994306299c
commit 8ddc2ac6ab
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

@@ -669,7 +669,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:
@@ -697,12 +697,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...")
@@ -885,7 +885,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: