Rename cmd constants

Author: lfir

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

@@ -13,16 +13,16 @@
 public class Main {
     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_PKGS = asList("sudo", "dnf", "--refresh", "install", "-y");
-    static List<String> CMD_DNF_RM_PKGS = asList("sudo", "dnf", "remove", "-y", "--noautoremove");
-    static List<String> CMD_DNF_MARK = asList("sudo", "dnf", "mark", "user", "flatpak");
+    static List<String> CMD_DNF_INST = asList("sudo", "dnf", "--refresh", "install", "-y");
+    static List<String> CMD_DNF_RM = asList("sudo", "dnf", "remove", "-y", "--noautoremove");
+    static List<String> CMD_DNF_MARK = asList("sudo", "dnf", "mark", "user", "flatpak"); // single arg appended to cmd
     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");
+    static List<String> CMD_SYSTEMCTL_ENABLE = asList("sudo", "systemctl", "enable", "--now", "cockpit.socket"); // single arg appended to cmd
 
     public static void main(String[] args) {
         run(args, new PostInstallUpdater());
@@ -57,12 +57,12 @@ static void run(String[] args, PostInstallUpdater updater) {
 
         if (confirm(scanner, "Install additional packages with DNF?")) {
             List<String> filtered = promptForExclusions(dnfInstallPackages, scanner);
-            updater.runCommand(CMD_DNF_INST_PKGS, filtered);
+            updater.runCommand(CMD_DNF_INST, filtered);
         }
 
         if (confirm(scanner, "Remove all DNF packages marked for removal?")) {
             List<String> filtered = promptForExclusions(dnfRemovePackages, scanner);
-            updater.runCommand(CMD_DNF_RM_PKGS, filtered);
+            updater.runCommand(CMD_DNF_RM, filtered);
             updater.runCommand(CMD_DNF_MARK, asList());
             updater.runCommand(CMD_DNF_AUTORM, asList());
         }

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

@@ -26,8 +26,8 @@ ProcessBuilder createProcessBuilder(String[] cmd) {
         return new ProcessBuilder(cmd);
     }
 
-    int runCommand(List<String> commandPrefix, List<String> args) {
-        String[] command = concat(commandPrefix.stream(), args.stream()).toArray(String[]::new);
+    int runCommand(List<String> baseCmd, List<String> args) {
+        String[] command = concat(baseCmd.stream(), args.stream()).toArray(String[]::new);
         System.out.println("Executing shell command: " + color(String.join(" ", command), BLUE));
         if (isDryRun()) {
             System.out.println(color("Dry-run: command not executed.", YELLOW));

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

@@ -10,10 +10,10 @@
 import static cf.maybelambda.fedora.ConfigManager.getRPMFusionRepos;
 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_PKGS;
+import static cf.maybelambda.fedora.Main.CMD_DNF_INST;
 import static cf.maybelambda.fedora.Main.CMD_DNF_INST_REPOS;
 import static cf.maybelambda.fedora.Main.CMD_DNF_MARK;
-import static cf.maybelambda.fedora.Main.CMD_DNF_RM_PKGS;
+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;
@@ -77,10 +77,10 @@ void runExecutesCommandStructureAndSequenceInCorrectOrdering() {
             assertEquals(CMD_DNF_INST_REPOS, prefixes.get(i));
             assertEquals(getRPMFusionRepos(), args.get(i)); 
             i++;
-            assertEquals(CMD_DNF_INST_PKGS, prefixes.get(i)); 
+            assertEquals(CMD_DNF_INST, prefixes.get(i)); 
             assertEquals(getDnfInstallPackages(), args.get(i)); 
             i++;
-            assertEquals(CMD_DNF_RM_PKGS, prefixes.get(i)); 
+            assertEquals(CMD_DNF_RM, prefixes.get(i)); 
             assertEquals(getDnfRemovePackages(), args.get(i)); 
             i++;
             assertEquals(CMD_DNF_MARK, prefixes.get(i));