more on firecfg --guide: fzenity

2 files changed, 12 insertions, 5 deletions

diff --git a/src/firecfg/firejail-welcome.sh b/src/firecfg/firejail-welcome.sh
index 7183b74e1..a7e74ebc3 100755
--- a/src/firecfg/firejail-welcome.sh
+++ b/src/firecfg/firejail-welcome.sh
@@ -36,12 +36,13 @@ enable_nonewprivs=false
 read -r -d $'\0' MSG_INTRO <<EOM
 <big><b>Welcome to Firejail!</b></big>
 
-This guide will walk you through some of the most common sandbox customizations. At the end of the
-guide you'll have the option to save your changes in Firejail's global config file at
-<b>/etc/firejail/firejail.config</b>. A copy of the original file is stored as
-<b>/etc/firejal/firejail.config-</b>.
+This guide will walk you through some of the most common sandbox customizations.
+At the end of the guide you'll have the option to save your changes in Firejail's
+global config file at <b>/etc/firejail/firejail.config</b>. A copy of the original file is saved
+as <b>/etc/firejal/firejail.config-</b>.
 
-Please note that running this script a second time can set new options, but does not clear options set in a previous run.
+Please note that running this script a second time can set new options, but does
+not clear options set in a previous run.
 
 Press OK to continue, or close this window to stop the program.
 
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 0c81f69bd..07e30415b 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -444,8 +444,14 @@ int main(int argc, char **argv) {
 
         if (arg_guide) {
                 char *cmd;
+if (arg_debug) {
+                if (asprintf(&cmd, "sudo %s/firejail/firejail-welcome.sh /usr/lib/firejail/fzenity %s %s", LIBDIR, SYSCONFDIR, user) == -1)
+                        errExit("asprintf");
+}
+else {
                 if (asprintf(&cmd, "sudo %s/firejail/firejail-welcome.sh /usr/bin/zenity %s %s", LIBDIR, SYSCONFDIR, user) == -1)
                         errExit("asprintf");
+}
                 int status = system(cmd);
                 if (status == -1) {
                         fprintf(stderr, "Error: cannot run firejail-welcome.sh\n");