From 1738bbf7181d6c3b6d9f82bfa5b3f6d21ad503c3 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Tue, 27 Feb 2018 07:52:49 -0500
Subject: appimage enhancements

---
 src/firejail/main.c    | 3 +++
 src/firejail/sandbox.c | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/firejail/main.c b/src/firejail/main.c
index 7543c5f4b..e8556de2d 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -2321,6 +2321,9 @@ int main(int argc, char **argv) {
 				cfg.command_name = strdup(argv[i]);
 				if (!cfg.command_name)
 					errExit("strdup");
+
+				// disable shell=* for appimages
+				arg_shell_none = 0;
 			}
 			else
 				extract_command_name(i, argv);
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 503d822a9..96b7b267b 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -799,7 +799,8 @@ int sandbox(void* sandbox_arg) {
 		}
 	}
 
-	if (arg_private_bin) {
+	// private-bin is disabled for appimages
+	if (arg_private_bin && !arg_appimage) {
 		if (cfg.chrootdir)
 			fwarning("private-bin feature is disabled in chroot\n");
 		else if (arg_overlay)
@@ -818,7 +819,8 @@ int sandbox(void* sandbox_arg) {
 		}
 	}
 
-	if (arg_private_lib) {
+	// private-lib is disabled for appimages
+	if (arg_private_lib && !arg_appimage) {
 		if (cfg.chrootdir)
 			fwarning("private-lib feature is disabled in chroot\n");
 		else if (arg_overlay)
-- 
cgit v1.2.3-54-g00ecf