From 6185c6f0767326a09d69f4e4e4c0d628f6b3ec33 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Sun, 5 Feb 2017 09:17:06 -0500
Subject: --git-install/--git-uninstall

---
 src/firejail/usage.c |  3 +++
 src/man/firejail.txt | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

(limited to 'src')

diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index 15ba22d4d..b9fff2011 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -76,6 +76,9 @@ void usage(void) {
 	printf("    --env=name=value - set environment variable.\n");
 	printf("    --fs.print=name|pid - print the filesystem log.\n");
 	printf("    --get=name|pid filename - get a file from sandbox container.\n");
+	printf("    --git-install - download, compile and install mainline git version\n");
+	printf("\tof Firejail.\n");
+	printf("    --git-uninstall - uninstall mainline git version of Firejail\n");
 	printf("    --help, -? - this help screen.\n");
 	printf("    --hostname=name - set sandbox hostname.\n");
 	printf("    --hosts-file=file - use file as /etc/hosts.\n");
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 993186476..f978661dc 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -453,6 +453,39 @@ $ firejail \-\-fs.print=3272
 \fB\-\-get=name|pid filename
 Get a file from sandbox container, see \fBFILE TRANSFER\fR section for more details.
 
+
+.TP
+\fB\-\-git-install
+Download, compile and install mainline git version of Firejail from the official repository on GitHub.
+The software is installed in /usr/local/bin, and takes precedence over the (old) version
+installed in /usr/bin. If for any reason the new version doesn't work, the user can uninstall it
+using \-\-git-uninstall command and revert to the old version.
+.br
+
+.br
+Prerequisites: git and compile support are required for this command to work. On Debian/Ubuntu
+systems this support is installed using "sudo apt-get install build-essential git".
+.br
+
+.br
+Example:
+.br
+
+.br
+$ firejail \-\-git-install
+
+.TP
+\fB\-\-git-uninstall
+Remove the Firejail version previously installed in /usr/local/bin using \-\-git-install command.
+.br
+
+.br
+Example:
+.br
+
+.br
+$ firejail \-\-git-uninstall
+
 .TP
 \fB\-?\fR, \fB\-\-help\fR
 Print options end exit.
-- 
cgit v1.2.3-70-g09d2