X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-uninstall.c;h=653aea729fb98ddd81aea093a4cc0e99af6e9f28;hb=81f8b62bb2813d1cce388f10f39435d14042147d;hp=1d4e0df0e9efdecad4caf3f95efb235c8f9e9a31;hpb=2c6fcae14552ab6e7addc82516617a135f86b5ca;p=src%2Fapp-framework-main.git diff --git a/src/wgtpkg-uninstall.c b/src/wgtpkg-uninstall.c index 1d4e0df..653aea7 100644 --- a/src/wgtpkg-uninstall.c +++ b/src/wgtpkg-uninstall.c @@ -1,5 +1,5 @@ /* - Copyright 2015 IoT.bzh + Copyright 2015, 2016, 2017 IoT.bzh author: José Bollo @@ -24,10 +24,14 @@ #include #include #include +#include #include "verbose.h" #include "utils-dir.h" #include "secmgr-wrap.h" +#include "wgtpkg-unit.h" +#include "wgt.h" +#include "wgt-info.h" /* uninstall the widget of idaver */ int uninstall_widget(const char *idaver, const char *root) @@ -37,6 +41,8 @@ int uninstall_widget(const char *idaver, const char *root) char path[PATH_MAX]; const char *at; int rc, rc2; + struct unitconf uconf; + struct wgt_info *ifo; NOTICE("-- UNINSTALLING widget of id %s from %s --", idaver, root); @@ -58,10 +64,22 @@ int uninstall_widget(const char *idaver, const char *root) return -1; } + /* removes the units */ + ifo = wgt_info_createat(AT_FDCWD, path, 1, 1, 1); + if (!ifo) { + ERROR("can't read widget config in directory '%s': %m", path); + return -1; + } + uconf.installdir = path; + uconf.icondir = FWK_ICON_DIR; + uconf.port = 0; + unit_uninstall(ifo, &uconf); + wgt_info_unref(ifo); + /* removes the directory of the application */ rc = remove_directory(path, 1); if (rc < 0) { - ERROR("error while removing directory '%s': %m", path); + ERROR("while removing directory '%s': %m", path); return -1; }