X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=550135cdd4ab2b5d77d92db61f09df11e80e835e;hb=a85c80f25325c69579f3b6c6df847d631e68d0b5;hp=8035a309df1567d826b33f94363a2fab72bd9444;hpb=f8ac4a3d0132968d06855177da630e8e788baee6;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 8035a30..550135c 100644
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015, 2016 IoT.bzh
+ Copyright 2015, 2016, 2017 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -30,6 +30,7 @@
 #include "verbose.h"
 #include "wgt.h"
 #include "wgt-info.h"
+#include "wgt-strings.h"
 #include "wgtpkg-files.h"
 #include "wgtpkg-workdir.h"
 #include "wgtpkg-zip.h"
@@ -39,10 +40,10 @@
 #include "secmgr-wrap.h"
 #include "utils-dir.h"
 
-static const char permission_required[] = "required";
-static const char permission_optional[] = "optional";
-static const char feature_required_permissions[] = FWK_PREFIX "required-permissions";
-static const char exec_type_string[] = "application/x-executable";
+static const char* exec_type_strings[] = {
+	"application/x-executable",
+	"application/vnd.agl.native"
+};
 
 static int check_defined(const void *data, const char *name)
 {
@@ -101,9 +102,9 @@ static int set_required_permissions(struct wgt_desc_param *params, int required)
 
 	while (params) {
 		/* check the value */
-		if (!strcmp(params->value, permission_required))
+		if (!strcmp(params->value, string_required))
 			optional = !required;
-		else if (!strcmp(params->value, permission_optional))
+		else if (!strcmp(params->value, string_optional))
 			optional = 1;
 		else {
 			ERROR("unexpected parameter value: %s found for %s", params->value, params->name);
@@ -133,7 +134,7 @@ static int check_widget(const struct wgt_desc *desc)
 	result = check_temporary_constraints(desc);
 	feature = desc->features;
 	while(result >= 0 && feature) {
-		if (!strcmp(feature->name, feature_required_permissions))
+		if (!strcmp(feature->name, feature_required_permission))
 			result = set_required_permissions(feature->params, feature->required);
 		feature = feature->next;
 	}
@@ -185,8 +186,16 @@ static int install_icon(const struct wgt_desc *desc)
 
 static int install_exec_flag(const struct wgt_desc *desc)
 {
-	return desc->content_type != NULL && !strcmp(desc->content_type, exec_type_string)
-		? fchmodat(workdirfd, desc->content_src, 0755, 0) : 0;
+	int i;
+
+	if (desc->content_type) {
+		i = sizeof exec_type_strings / sizeof *exec_type_strings;
+		while (i) {
+			if (!strcasecmp(desc->content_type, exec_type_strings[--i]))
+				return fchmodat(workdirfd, desc->content_src, 0755, 0);
+		}
+	}
+	return 0;
 }
 
 static int install_security(const struct wgt_desc *desc)
@@ -241,6 +250,7 @@ static int install_security(const struct wgt_desc *desc)
 	perm = first_usable_permission();
 	while(perm) {
 		rc = secmgr_permit(perm);
+		INFO("permitting %s %s", perm, rc ? "FAILED!" : "success");
 		if (rc)
 			goto error2;
 		perm = next_usable_permission();