浏览代码

pls: Implement support for `--preserve-env`

Tim Schumacher 3 年之前
父节点
当前提交
93488d6d5a
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      Userland/Utilities/pls.cpp

+ 4 - 1
Userland/Utilities/pls.cpp

@@ -17,8 +17,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     Vector<StringView> command;
     Vector<StringView> command;
     Core::ArgsParser args_parser;
     Core::ArgsParser args_parser;
     uid_t as_user_uid = 0;
     uid_t as_user_uid = 0;
+    bool preserve_env = false;
     args_parser.set_stop_on_first_non_option(true);
     args_parser.set_stop_on_first_non_option(true);
     args_parser.add_option(as_user_uid, "User to execute as", nullptr, 'u', "UID");
     args_parser.add_option(as_user_uid, "User to execute as", nullptr, 'u', "UID");
+    args_parser.add_option(preserve_env, "Preserve user environment when running command", "preserve-env", 'E');
     args_parser.add_positional_argument(command, "Command to run at elevated privilege level", "command");
     args_parser.add_positional_argument(command, "Command to run at elevated privilege level", "command");
     args_parser.parse(arguments);
     args_parser.parse(arguments);
 
 
@@ -53,7 +55,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         if (!maybe_needle.has_value())
         if (!maybe_needle.has_value())
             continue;
             continue;
 
 
-        if (env_view.substring_view(0, maybe_needle.value()) != "TERM"sv)
+        // FIXME: Allow a custom selection of variables once ArgsParser supports options with optional parameters.
+        if (!preserve_env && env_view.substring_view(0, maybe_needle.value()) != "TERM"sv)
             continue;
             continue;
 
 
         exec_environment.append(env_view);
         exec_environment.append(env_view);