ISSUE-20 Fix Systemd service names with dots

rovellipaolo · Oct 20, 2023 · 7aa517b · 7aa517b
1 parent 63cab98
commit 7aa517b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ build-settings:
 .PHONY: install
 install:
 	gnome-extensions install [email protected] --force
-	echo "Remember to restart GNOME Shell: press 'Alt'+'F2', type 'r' and press enter."
+	@echo "Remember to restart GNOME Shell: press 'Alt'+'F2', type 'r' and press enter."
 
 .PHONY: install-checkstyle
 install-checkstyle:

diff --git a/metadata.json b/metadata.json
@@ -14,5 +14,5 @@
         "43",
         "44"
     ],
-    "version": 24
+    "version": 25
 }
diff --git a/src/data/systemdRepository.js b/src/data/systemdRepository.js
@@ -236,7 +236,7 @@ var _parseService = (stdout, all = false) => {
     service.id = stdout[LIST_INDEX_ID];
     service.name = service.id.substring(
         0,
-        service.id.indexOf(LIST_ID_NAME_SEPARATOR)
+        service.id.lastIndexOf(LIST_ID_NAME_SEPARATOR)
     );
     if (all) {
         service.isEnabled =

diff --git a/test/data/systemdRepositoryTest.js b/test/data/systemdRepositoryTest.js
@@ -24,7 +24,7 @@ function testSuite() {
         "cron.service                               enabled-runtime enabled      \n" +
         "dbus.service                               static          enabled      \n" +
         "docker.service                             enabled         enabled      \n" +
-        "lxc.service                                generated       enabled      \n" +
+        "lxc.lxc5.service                           generated       enabled      \n" +
         "rsync.service                              enabled         enabled      \n" +
         "8 unit files listed.";
     const NO_ALL_SERVICES_STDOUT =
@@ -36,7 +36,7 @@ function testSuite() {
         "● apport.service                                                                          masked    inactive dead    LSB: automatic crash report generation\n" +
         "cron.service                                                                              loaded    inactive dead    Regular background program processing daemon\n" +
         "docker.service                                                                            loaded    active   running Docker Application Container Engine\n" +
-        "lxc.service                                                                               loaded    active   exited  lxc.service\n" +
+        "lxc.lxc5.service                                                                          loaded    active   exited  lxc.service\n" +
         "rsync.service                                                                             loaded    active   running fast remote file copy program daemon\n" +
         "\n" +
         "LOAD   = Reflects whether the unit definition was properly loaded.\n" +
@@ -104,8 +104,8 @@ function testSuite() {
         isRunning: true,
     };
     const SERVICE_LXC = {
-        id: "lxc.service",
-        name: "lxc",
+        id: "lxc.lxc5.service",
+        name: "lxc.lxc5",
         isEnabled: true,
         canBeEnabled: false,
         isActive: true,
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,5 +14,5 @@ @@
             "43",
             "44"
         ],
-        "version": 24
+        "version": 25
     }