diff --git a/.gitignore b/.gitignore index dbfb3d94..ea3c8b49 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ missing mkinstalldirs test-driver docs/build +release/lnav.spec release/release-NEWS.md release/linux-pkg/ release/osx-build-dir/ diff --git a/NEWS.md b/NEWS.md index 55e83c2d..9e4b36f7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -23,6 +23,8 @@ Features: * Added a `:set-text-view-mode` command that controls whether file contents, such as markdown, are rendered or shown in their raw state. +* Added a `pretty_print()` SQL function that provides the same + functionality as the PRETTY view. Interface Changes: * The "Gantt Chart" view has been renamed to "timeline". diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bcff7952..0e6da332 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -179,7 +179,6 @@ set(FORMAT_FILES formats/openamdb_log.json formats/openstack_log.json formats/page_log.json - formats/papertrail_log.json formats/pcap_log.json formats/procstate_log.json formats/redis_log.json diff --git a/src/command_executor.cc b/src/command_executor.cc index 1a178e01..d7c35e4b 100644 --- a/src/command_executor.cc +++ b/src/command_executor.cc @@ -702,8 +702,16 @@ execute_file(exec_context& ec, const std::string& path_and_args) paths_to_exec.push_back({script_name, "", "", ""}); } else if (access(script_name.c_str(), R_OK) == 0) { struct script_metadata meta; + auto rp_res = lnav::filesystem::realpath(script_name); - meta.sm_path = script_name; + if (rp_res.isErr()) { + log_error("unable to get realpath() of %s -- %s", + script_name.c_str(), + rp_res.unwrapErr().c_str()); + meta.sm_path = script_name; + } else { + meta.sm_path = rp_res.unwrap(); + } extract_metadata_from_file(meta); paths_to_exec.push_back(meta); } else if (errno != ENOENT) { diff --git a/src/help.txt b/src/help.txt index 8ef16a84..489d18fe 100644 --- a/src/help.txt +++ b/src/help.txt @@ -747,14 +747,6 @@ COMMANDS type of action to perform (command, SQL query, execute script). - pt-min-time [|] - Set/get the minimum time range for any papertrail queries. - Absolute or relative time values can be specified. - - pt-max-time [|] - Set/get the maximum time range for any papertrail queries. - Absolute or relative time values can be specified. - config