optimize required_screens definition to avoid tidy weirdness

Signed-off-by: Adam Williamson <awilliam@redhat.com>

tests/applications/gnome-initial-setup/gnome_initial_setup.pm

@@ -116,23 +116,9 @@ sub run {
     # Also track which screens were visited already.
     my $iterations = 0;
     my %visited_screens;
-    my @required_screens = qw(
-      welcome
-      privacy
-      timezone
-      software
-      credentials
-      password
-    );
-    if (get_var('CANNED')) {
-        @required_screens = qw(
-            welcome
-            privacy
-            timezone
-            credentials
-            password
-        );
-    }
+    my @required_screens = qw(welcome privacy timezone credentials password);
+    # no software screen on Silverblue
+    push(@required_screens, 'software') unless (get_var('CANNED'));
 
     while (1) {
         die("GNOME Initial Setup appears stuck") if ++$iterations > 20;