osInfo() fix fqdn

sebhildebrandt · Dec 24, 2024 · 7809278 · 7809278
1 parent a9dbc36
commit 7809278
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -90,6 +90,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version | Date       | Comment                                                                                             |
 | ------- | ---------- | --------------------------------------------------------------------------------------------------- |
+| 5.23.21 | 2024-12-24 | `osInfo()` fix fqdn                                                                                 |
 | 5.23.20 | 2024-12-24 | `cpu()` fix timeout                                                                                 |
 | 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                                                    |

diff --git a/docs/history.html b/docs/history.html
@@ -58,7 +58,12 @@ <h3>Full version history</h3>
                   </thead>
                   <tbody>
                     <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><span class="code">inetChecksite()</span> fix timeout</td>
                     </tr>

diff --git a/docs/index.html b/docs/index.html
@@ -170,7 +170,7 @@
       <img class="logo" src="assets/logo.png" alt="logo">
       <div class="title">systeminformation</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>
     </div>
     <div class="down">

diff --git a/lib/osinfo.js b/lib/osinfo.js
@@ -190,17 +190,10 @@ function getFQDN() {
   let fqdn = os.hostname;
   if (_linux || _darwin) {
     try {
-      const stdout = execSync('hostnamectl --json short 2>/dev/null', util.execOptsLinux);
-      const json = JSON.parse(stdout.toString());
-
-      fqdn = json['StaticHostname'];
+      const stdout = execSync('hostname -f 2>/dev/null', util.execOptsLinux);
+      fqdn = stdout.toString().split(os.EOL)[0];
     } catch (e) {
-      try {
-        const stdout = execSync('hostname -f 2>/dev/null', util.execOptsLinux);
-        fqdn = stdout.toString().split(os.EOL)[0];
-      } catch (e) {
-        util.noop();
-      }
+      util.noop();
     }
   }
   if (_freebsd || _openbsd || _netbsd) {