mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osInfo() fix fqdn

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2024-12-24 13:27:20 +01:00
parent a9dbc36ba6
commit 7809278b35
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -90,6 +90,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
| Version | Date | Comment | | Version | Date | Comment |
| ------- | ---------- | --------------------------------------------------------------------------------------------------- | | ------- | ---------- | --------------------------------------------------------------------------------------------------- |
| 5.23.21 | 2024-12-24 | `osInfo()` fix fqdn |
| 5.23.20 | 2024-12-24 | `cpu()` fix timeout | | 5.23.20 | 2024-12-24 | `cpu()` fix timeout |
| 5.23.19 | 2024-12-24 | `cpu()` refactored using internal node functions | | 5.23.19 | 2024-12-24 | `cpu()` refactored using internal node functions |
| 5.23.18 | 2024-12-24 | `cpu()` Handle RISC-V CPU Manufacturer and Brand | | 5.23.18 | 2024-12-24 | `cpu()` Handle RISC-V CPU Manufacturer and Brand |

7
docs/history.html
View File

@ -58,7 +58,12 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<th scope="row">5.23.19</th> <th scope="row">5.23.21</th>
<td>2024-12-24</td>
<td><span class="code">osInfo()</span> fix fqdn (linux)</td>
</tr>
<tr>
<th scope="row">5.23.20</th>
<td>2024-12-24</td> <td>2024-12-24</td>
<td><span class="code">inetChecksite()</span> fix timeout</td> <td><span class="code">inetChecksite()</span> fix timeout</td>
</tr> </tr>

2
docs/index.html
View File

@ -170,7 +170,7 @@
<img class="logo" src="assets/logo.png" alt="logo"> <img class="logo" src="assets/logo.png" alt="logo">
<div class="title">systeminformation</div> <div class="title">systeminformation</div>
<div class="subtitle"><span id="typed"></span>&nbsp;</div> <div class="subtitle"><span id="typed"></span>&nbsp;</div>
<div class="version">New Version: <span id="version">5.23.20</span></div> <div class="version">New Version: <span id="version">5.23.21</span></div>
<button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button> <button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
</div> </div>
<div class="down"> <div class="down">

7
lib/osinfo.js
View File

@ -189,12 +189,6 @@ function getLogoFile(distro) {
function getFQDN() { function getFQDN() {
let fqdn = os.hostname; let fqdn = os.hostname;
if (_linux || _darwin) { if (_linux || _darwin) {
try {
const stdout = execSync('hostnamectl --json short 2>/dev/null', util.execOptsLinux);
const json = JSON.parse(stdout.toString());
fqdn = json['StaticHostname'];
} catch (e) {
try { try {
const stdout = execSync('hostname -f 2>/dev/null', util.execOptsLinux); const stdout = execSync('hostname -f 2>/dev/null', util.execOptsLinux);
fqdn = stdout.toString().split(os.EOL)[0]; fqdn = stdout.toString().split(os.EOL)[0];
@ -202,7 +196,6 @@ function getFQDN() {
util.noop(); util.noop();
} }
} }
}
if (_freebsd || _openbsd || _netbsd) { if (_freebsd || _openbsd || _netbsd) {
try { try {
const stdout = execSync('hostname 2>/dev/null'); const stdout = execSync('hostname 2>/dev/null');