Remove unneeded group pre-existence check

Author: lfir

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cf.maybelambda</groupId>
     <artifactId>fedora-setup-script</artifactId>
-    <version>3.0.5</version>
+    <version>3.0.6</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.20.0</version>
+            <version>5.21.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -46,7 +46,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.2</version>
+                <version>3.5.0</version>
                 <configuration>
                     <archive>
                         <manifest>

src/main/java/cf/maybelambda/fedora/Main.java

@@ -11,6 +11,8 @@
 import java.util.Scanner;
 
 public class Main {
+    private static final String OS_USERNAME_PROP = "user.name";
+    
     static List<String> CMD_RPM_IMPORT = asList("sudo", "rpm", "--import");
     static List<String> CMD_DNF_INST_REPOS = asList("sudo", "dnf", "install", "-y");
     static List<String> CMD_DNF_INST = asList("sudo", "dnf", "--refresh", "install", "-y");
@@ -19,7 +21,6 @@ public class Main {
     static List<String> CMD_DNF_AUTORM = asList("sudo", "dnf", "autoremove", "-y");
     static List<String> CMD_FLATPAK_REMOTE_ADD = asList("sudo", "flatpak", "remote-add", "--if-not-exists");
     static List<String> CMD_FLATPAK_INST = asList("flatpak", "install", "-y");
-    static List<String> CMD_GETENT = asList("getent", "group");
     static List<String> CMD_ADD_GROUP = asList("sudo", "groupadd");
     static List<String> CMD_ADD_USER_TO_GROUP = asList("sudo", "usermod", "-aG");
     static List<String> CMD_SYSTEMCTL_ENABLE = asList("sudo", "systemctl", "enable", "--now", "cockpit.socket"); // single arg appended to cmd
@@ -91,14 +92,9 @@ static void run(String[] args, PostInstallUpdater updater) {
         }
 
         if (confirm(scanner, "Ensure admin groups exist and add current user to them?")) {
-            String user = System.getProperty("user.name");
+            String user = System.getProperty(OS_USERNAME_PROP);
             for (String group : ConfigManager.getAdminGroups()) {
-                int exit = updater.runCommand(CMD_GETENT, asList(group));
-                boolean groupExists = (exit == 0);
-                if (!groupExists) {
-                    System.out.println("Group '" + group + "' does not exist. Creating...");
-                    updater.runCommand(CMD_ADD_GROUP, asList(group));
-                }
+                updater.runCommand(CMD_ADD_GROUP, asList(group));
                 updater.runCommand(CMD_ADD_USER_TO_GROUP, asList(group, user));
             }
         }

src/test/java/cf/maybelambda/fedora/MainTests.java

@@ -8,6 +8,7 @@
 import static cf.maybelambda.fedora.ConfigManager.getFlatpakRemoteUrl;
 import static cf.maybelambda.fedora.ConfigManager.getRPMFusionGpgKeys;
 import static cf.maybelambda.fedora.ConfigManager.getRPMFusionRepos;
+import static cf.maybelambda.fedora.Main.CMD_ADD_GROUP;
 import static cf.maybelambda.fedora.Main.CMD_ADD_USER_TO_GROUP;
 import static cf.maybelambda.fedora.Main.CMD_DNF_AUTORM;
 import static cf.maybelambda.fedora.Main.CMD_DNF_INST;
@@ -16,7 +17,6 @@
 import static cf.maybelambda.fedora.Main.CMD_DNF_RM;
 import static cf.maybelambda.fedora.Main.CMD_FLATPAK_INST;
 import static cf.maybelambda.fedora.Main.CMD_FLATPAK_REMOTE_ADD;
-import static cf.maybelambda.fedora.Main.CMD_GETENT;
 import static cf.maybelambda.fedora.Main.CMD_RPM_IMPORT;
 import static cf.maybelambda.fedora.Main.CMD_SYSTEMCTL_ENABLE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -95,7 +95,7 @@ void runExecutesCommandStructureAndSequenceInCorrectOrdering() {
             assertEquals(CMD_FLATPAK_INST, prefixes.get(i));
             assertEquals(List.of(getFlatpakRemoteName(), getFlatpakInstallPackages().getFirst()), args.get(i)); 
             i++;
-            assertEquals(CMD_GETENT, prefixes.get(i)); 
+            assertEquals(CMD_ADD_GROUP, prefixes.get(i)); 
             assertEquals(getAdminGroups(), args.get(i)); 
             i++;
             assertEquals(CMD_ADD_USER_TO_GROUP, prefixes.get(i));