X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-installer.c;h=9adeae43839dba62e8677c70ae681ec4435b7f57;hb=7553044c59814c33763bb4b1c34664dceed68735;hp=62807aa984e468ef5918aef507db0449b45aaf34;hpb=e2de563d1ecb4585ce68521bd42f3ef45ac79f16;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-installer.c b/src/wgtpkg-installer.c
index 62807aa..9adeae4 100644
--- a/src/wgtpkg-installer.c
+++ b/src/wgtpkg-installer.c
@@ -1,5 +1,7 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright (C) 2015-2019 IoT.bzh
+
+ author: José Bollo <jose.bollo@iot.bzh>
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -23,16 +25,34 @@
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
-#include <syslog.h>
 #include <getopt.h>
 
+#include <libxml/tree.h>
+
 #include "verbose.h"
-#include "wgtpkg.h"
+#include "wgtpkg-permissions.h"
+#include "wgtpkg-xmlsec.h"
+#include "wgt-info.h"
+#include "wgtpkg-install.h"
 
-static const char appname[] = "wgtpkg-install";
+static const char appname[] = "wgtpkg-installer";
 static const char *root;
 static int force;
 
+static void version()
+{
+	printf(
+		"\n"
+		"  %s  version="AFM_VERSION"\n"
+		"\n"
+		"  Copyright (C) 2015-2019 \"IoT.bzh\"\n"
+		"  AFB comes with ABSOLUTELY NO WARRANTY.\n"
+		"  Licence Apache 2\n"
+		"\n",
+		appname
+	);
+}
+
 static void usage()
 {
 	printf(
@@ -43,6 +63,7 @@ static void usage()
 		"   -f            force overwriting\n"
 		"   -q            quiet\n"
 		"   -v            verbose\n"
+		"   -V            version\n"
 		"\n",
 		appname
 	);
@@ -54,22 +75,23 @@ static struct option options[] = {
 	{ "help",        no_argument,       NULL, 'h' },
 	{ "quiet",       no_argument,       NULL, 'q' },
 	{ "verbose",     no_argument,       NULL, 'v' },
+	{ "version",     no_argument,       NULL, 'V' },
 	{ NULL, 0, NULL, 0 }
 };
 
 /* install the widgets of the list */
 int main(int ac, char **av)
 {
-	int i;
-	char *wpath;
+	int i, rc;
+	struct wgt_info *ifo;
 
-	openlog(appname, LOG_PERROR, LOG_AUTH);
+	LOGAUTH(appname);
 
 	xmlsec_init();
 
 	force = 0;
 	for (;;) {
-		i = getopt_long(ac, av, "hfqvp:", options, NULL);
+		i = getopt_long(ac, av, "hfqvVp:", options, NULL);
 		if (i < 0)
 			break;
 		switch (i) {
@@ -86,8 +108,15 @@ int main(int ac, char **av)
 		case 'v':
 			verbosity++;
 			break;
+		case 'V':
+			version();
+			return 0;
 		case 'p':
-			grant_permission_list(optarg);
+			rc = grant_permission_list(optarg);
+			if (rc < 0) {
+				ERROR("Can't set granted permission list");
+				exit(1);
+			}
 			break;
 		case ':':
 			ERROR("missing argument value");
@@ -104,21 +133,14 @@ int main(int ac, char **av)
 		return 1;
 	}
 
-	/* canonic names for files */
+	/* install widgets */
 	av += optind;
-	for (i = 0 ; av[i] != NULL ; i++) {
-		wpath = realpath(av[i], NULL);
-		if (wpath == NULL) {
-			ERROR("error while getting realpath of %dth widget: %s", i+1, av[i]);
-			return 1;
-		}
-		av[i] = wpath;
-	}
 	root = *av++;
-
-	/* install widgets */
-	for ( ; *av ; av++)
-		install_widget(*av, root, force);
+	for ( ; *av ; av++) {
+		ifo = install_widget(*av, root, force);
+		if (ifo)
+			wgt_info_unref(ifo);
+	}
 
 	return 0;
 }