[PR #5829] [MERGED] modif: Improve --version/--help & print version on startup #5685

Closed
opened 2026-05-05 10:42:59 -06:00 by gitea-mirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/5829
Author: @kmk3
Created: 5/14/2023
Status: Merged
Merged: 5/19/2023
Merged by: @netblue30

Base: masterHead: improve-print-version


📝 Commits (9)

  • 3c2ac6a jailcheck: fix wrong program name in --version
  • fcbc8ce Remove dash before version on --help output
  • 1b8e33f firejail: move print_version from checkcfg.c to usage.c
  • a29fd5c firejail: deduplicate version printing
  • b84495b firejail: simplify print_compiletime_support function
  • 727da58 Standardize version output
  • 874cf79 Standardize usage string var declarations
  • 15ad869 Move usage text into usage_str var
  • f019f0e Print version on startup for firejail/firecfg

📊 Changes

25 files changed (+219 additions, -181 deletions)

View changed files

📝 src/etc-cleanup/main.c (+9 -6)
📝 src/fbuilder/main.c (+5 -2)
📝 src/fcopy/main.c (+9 -8)
📝 src/fids/main.c (+3 -2)
📝 src/firecfg/main.c (+9 -5)
📝 src/firejail/checkcfg.c (+24 -43)
📝 src/firejail/firejail.h (+2 -1)
📝 src/firejail/main.c (+7 -2)
📝 src/firejail/usage.c (+11 -4)
📝 src/firemon/firemon.c (+1 -1)
📝 src/firemon/firemon.h (+1 -0)
📝 src/firemon/usage.c (+8 -5)
📝 src/fldd/main.c (+6 -5)
📝 src/fnet/main.c (+13 -11)
📝 src/fnetfilter/main.c (+5 -2)
📝 src/fnettrace-dns/main.c (+5 -5)
📝 src/fnettrace-icmp/main.c (+6 -4)
📝 src/fnettrace-sni/main.c (+5 -4)
📝 src/fnettrace/main.c (+13 -11)
📝 src/fsec-optimize/main.c (+5 -2)

...and 5 more files

📄 Description

It is not too uncommon for the firejail version to be missing when issues are
reported; this PR makes it more likely that any posted logs will contain the
program version.

Do so just for firejail and firecfg for now because they are the most common
user-facing programs.

Kind of relates to #5275.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/5829 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 5/14/2023 **Status:** ✅ Merged **Merged:** 5/19/2023 **Merged by:** [@netblue30](https://github.com/netblue30) **Base:** `master` ← **Head:** `improve-print-version` --- ### 📝 Commits (9) - [`3c2ac6a`](https://github.com/netblue30/firejail/commit/3c2ac6a55acfdaa618a0d267e4694c031358d370) jailcheck: fix wrong program name in --version - [`fcbc8ce`](https://github.com/netblue30/firejail/commit/fcbc8ce972e1a035c30e945c7e985beda841f809) Remove dash before version on --help output - [`1b8e33f`](https://github.com/netblue30/firejail/commit/1b8e33f734b9d292e735884be54ae03cc361e431) firejail: move print_version from checkcfg.c to usage.c - [`a29fd5c`](https://github.com/netblue30/firejail/commit/a29fd5cac31a634a7859c1b4365a090b636768f7) firejail: deduplicate version printing - [`b84495b`](https://github.com/netblue30/firejail/commit/b84495b64b31d3131a147575e6db2f53f8da467b) firejail: simplify print_compiletime_support function - [`727da58`](https://github.com/netblue30/firejail/commit/727da58819051dccaa6df3304042de93c6a9876d) Standardize version output - [`874cf79`](https://github.com/netblue30/firejail/commit/874cf79422f168c4c583645b41227ec57aefda2e) Standardize usage string var declarations - [`15ad869`](https://github.com/netblue30/firejail/commit/15ad8696c7cf95059f163b4f7ed86ca697e8fe1e) Move usage text into usage_str var - [`f019f0e`](https://github.com/netblue30/firejail/commit/f019f0ec3fd807676855c99f11dd2fcebfc1da27) Print version on startup for firejail/firecfg ### 📊 Changes **25 files changed** (+219 additions, -181 deletions) <details> <summary>View changed files</summary> 📝 `src/etc-cleanup/main.c` (+9 -6) 📝 `src/fbuilder/main.c` (+5 -2) 📝 `src/fcopy/main.c` (+9 -8) 📝 `src/fids/main.c` (+3 -2) 📝 `src/firecfg/main.c` (+9 -5) 📝 `src/firejail/checkcfg.c` (+24 -43) 📝 `src/firejail/firejail.h` (+2 -1) 📝 `src/firejail/main.c` (+7 -2) 📝 `src/firejail/usage.c` (+11 -4) 📝 `src/firemon/firemon.c` (+1 -1) 📝 `src/firemon/firemon.h` (+1 -0) 📝 `src/firemon/usage.c` (+8 -5) 📝 `src/fldd/main.c` (+6 -5) 📝 `src/fnet/main.c` (+13 -11) 📝 `src/fnetfilter/main.c` (+5 -2) 📝 `src/fnettrace-dns/main.c` (+5 -5) 📝 `src/fnettrace-icmp/main.c` (+6 -4) 📝 `src/fnettrace-sni/main.c` (+5 -4) 📝 `src/fnettrace/main.c` (+13 -11) 📝 `src/fsec-optimize/main.c` (+5 -2) _...and 5 more files_ </details> ### 📄 Description It is not too uncommon for the firejail version to be missing when issues are reported; this PR makes it more likely that any posted logs will contain the program version. Do so just for firejail and firecfg for now because they are the most common user-facing programs. Kind of relates to #5275. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
gitea-mirror 2026-05-05 10:42:59 -06:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#5685
No description provided.