Apply suggestions from code review

Co-authored-by: Lukas Backström (FKA Larsson) <[email protected]>

lib/kernel/src/os.erl

@@ -519,6 +519,7 @@ cmd(Cmd) ->
 -doc """
 Executes `Command` in a command shell of the target OS, captures the standard
 output and standard error of the command, and returns this result as a string.
+
 The command shell can be set using the
 [kernel configuration parameter](kernel_app.md#os_cmd_shell), by default the
 shell is detected upon system startup.

lib/kernel/test/os_SUITE.erl

@@ -62,7 +62,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_testcase(TC, Config)
-  when TC =:= background_command; TC =:= close_stdin; TC =:= os_cmd_shell ->
+  when TC =:= background_command; TC =:= close_stdin ->
     case os:type() of
         {win32, _} ->
             {skip,"Should not work on windows"};
@@ -475,13 +475,15 @@ os_cmd_shell(Config) ->
     SysShell = filename:join(DataDir, "sys_shell"),
 
     {ok, OldShell} = application:get_env(kernel, os_cmd_shell),
-    application:set_env(kernel, os_cmd_shell, SysShell),
-
-    %% os:cmd should not try to detect the shell location rather than use
-    %% the value from kernel:os_cmd_shell parameter
-    Ls = os:cmd("ls"),
-    application:set_env(kernel, os_cmd_shell, OldShell),
-    comp("sys_shell", Ls).
+    try
+        application:set_env(kernel, os_cmd_shell, SysShell),
+
+        %% os:cmd should not try to detect the shell location rather than use
+        %% the value from kernel:os_cmd_shell parameter
+        comp("sys_shell", os:cmd("ls"))
+    after
+        application:set_env(kernel, os_cmd_shell, OldShell),
+    end.
 
 no_limit_for_opened_files() ->
     case os:type() of