wgtpkg-install: Force uninstall

[src/app-framework-main.git] / src / wgtpkg-install.c

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 79cb7fb..896392a 100644 (file)
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -40,6 +40,7 @@
 #include "wgtpkg-permissions.h"
 #include "wgtpkg-digsig.h"
 #include "wgtpkg-install.h"
+#include "wgtpkg-uninstall.h"
 #include "secmgr-wrap.h"
 #include "utils-dir.h"
 #include "wgtpkg-unit.h"
@@ -295,6 +296,7 @@ static int check_one_content(const char *src, const char *type)
 {
        int rc;
        struct stat s;
+       int fhtdocs, serr;
 
        if (!src) {
                ERROR("a content src is missing");
@@ -304,6 +306,16 @@ static int check_one_content(const char *src, const char *type)
                /* TODO: when dealing with HTML and languages, the check should
                 * include i18n path search of widgets */
                rc = fstatat(workdirfd, src, &s, AT_NO_AUTOMOUNT|AT_SYMLINK_NOFOLLOW);
+               if (rc < 0) {
+                       serr = errno;
+                       fhtdocs = openat(workdirfd, "htdocs", O_DIRECTORY|O_PATH);
+                       if (fhtdocs >= 0) {
+                               rc = fstatat(fhtdocs, src, &s, AT_NO_AUTOMOUNT|AT_SYMLINK_NOFOLLOW);
+                               serr = errno;
+                               close(fhtdocs);
+                       }
+                       errno = serr;
+               }
                if (rc < 0)
                        ERROR("can't get info on content %s: %m", src);
                else if (!S_ISREG(s.st_mode)) {
@@ -521,6 +533,16 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
        if (get_target_directory(installdir, root, desc))
                goto error3;
 
+       if (access(installdir, F_OK) == 0) {
+               if (!force) {
+                       ERROR("widget already installed");
+                       errno = EEXIST;
+                       goto error3;
+               }
+               if (uninstall_widget(desc->idaver, root))
+                       goto error3;
+       }
+
        if (move_widget_to(installdir, force))
                goto error3;