diff --git a/CMakeLists.txt b/CMakeLists.txt index abea357c..3ef1af81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,8 @@ include(cmake/prelude.cmake) set(CMAKE_CXX_STANDARD 14) project( lnav - VERSION 0.12.1 - DESCRIPTION "An advanced log file viewer for the small-scale." + VERSION 0.12.2 + DESCRIPTION "An advanced log file viewer for the terminal." HOMEPAGE_URL "https://lnav.org/" LANGUAGES CXX C ) diff --git a/configure.ac b/configure.ac index 1446eb82..c2e553d7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([lnav],[0.12.1],[lnav@googlegroups.com],[lnav],[http://lnav.org]) +AC_INIT([lnav],[0.12.2],[lnav@googlegroups.com],[lnav],[http://lnav.org]) AC_CONFIG_SRCDIR([src/lnav.cc]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign subdir-objects]) diff --git a/release/Makefile b/release/Makefile index 05358d52..a7ea5164 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,5 +1,5 @@ -VERSION=0.12.1 +VERSION=0.12.2 VERSION_TAG=v$(VERSION) diff --git a/src/command_executor.cc b/src/command_executor.cc index 7684eba7..cf152535 100644 --- a/src/command_executor.cc +++ b/src/command_executor.cc @@ -1052,6 +1052,8 @@ pipe_callback(exec_context& ec, const std::string& cmdline, auto_fd& fd) return std::string(); }); } + std::error_code errc; + ghc::filesystem::create_directories(lnav::paths::workdir(), errc); auto open_temp_res = lnav::filesystem::open_temp_file(lnav::paths::workdir() / "exec.XXXXXX"); if (open_temp_res.isErr()) { diff --git a/src/readline_callbacks.cc b/src/readline_callbacks.cc index bc81a5a0..73c75838 100644 --- a/src/readline_callbacks.cc +++ b/src/readline_callbacks.cc @@ -1008,6 +1008,8 @@ rl_callback_int(readline_curses* rc, bool is_alt) } case ln_mode_t::EXEC: { + std::error_code errc; + ghc::filesystem::create_directories(lnav::paths::workdir(), errc); auto open_temp_res = lnav::filesystem::open_temp_file( lnav::paths::workdir() / "exec.XXXXXX"); diff --git a/src/url_loader.hh b/src/url_loader.hh index cb2a9a1b..bbe582f9 100644 --- a/src/url_loader.hh +++ b/src/url_loader.hh @@ -44,6 +44,8 @@ class url_loader : public curl_request { public: url_loader(const std::string& url) : curl_request(url) { + std::error_code errc; + ghc::filesystem::create_directories(lnav::paths::workdir(), errc); auto tmp_res = lnav::filesystem::open_temp_file(lnav::paths::workdir() / "url.XXXXXX"); if (tmp_res.isErr()) { diff --git a/test/expected/expected.am b/test/expected/expected.am index d725eb89..47b56cf6 100644 --- a/test/expected/expected.am +++ b/test/expected/expected.am @@ -676,6 +676,8 @@ EXPECTED_FILES = \ $(srcdir)/%reldir%/test_sql.sh_764306f0e5f610ba71f521ba3d19fe158ece0ba5.out \ $(srcdir)/%reldir%/test_sql.sh_7f664c9cda0ae1c48333e21051b5e0eeafd5b4bc.err \ $(srcdir)/%reldir%/test_sql.sh_7f664c9cda0ae1c48333e21051b5e0eeafd5b4bc.out \ + $(srcdir)/%reldir%/test_sql.sh_859af4cc5f57345be8dcece599419d58f332841a.err \ + $(srcdir)/%reldir%/test_sql.sh_859af4cc5f57345be8dcece599419d58f332841a.out \ $(srcdir)/%reldir%/test_sql.sh_85fe3b9803254ea54b864d4865d7bd4d7a7f86c6.err \ $(srcdir)/%reldir%/test_sql.sh_85fe3b9803254ea54b864d4865d7bd4d7a7f86c6.out \ $(srcdir)/%reldir%/test_sql.sh_8ee288f1508eaab0367e465e9f382e848f3282aa.err \ diff --git a/test/expected/test_sessions.sh_6d87ff483d5785c58fb271a405ff1c35e4f83cd9.out b/test/expected/test_sessions.sh_6d87ff483d5785c58fb271a405ff1c35e4f83cd9.out index 36d43be2..8b72915a 100644 --- a/test/expected/test_sessions.sh_6d87ff483d5785c58fb271a405ff1c35e4f83cd9.out +++ b/test/expected/test_sessions.sh_6d87ff483d5785c58fb271a405ff1c35e4f83cd9.out @@ -3,8 +3,8 @@ # '|/path/to/this/file' in lnav to execute this file and # restore the state of the session. -;SELECT raise_error('This session export was made with a newer version of lnav, please upgrade to ' || '0.12.1' || ' or later') - WHERE lnav_version() < '0.12.1' COLLATE naturalcase +;SELECT raise_error('This session export was made with a newer version of lnav, please upgrade to ' || '0.12.2' || ' or later') + WHERE lnav_version() < '0.12.2' COLLATE naturalcase # The files loaded into the session were: diff --git a/test/expected/test_sessions.sh_e988439404f2e97604641c8d087855f3efe052e4.out b/test/expected/test_sessions.sh_e988439404f2e97604641c8d087855f3efe052e4.out index b861e0eb..05b75053 100644 --- a/test/expected/test_sessions.sh_e988439404f2e97604641c8d087855f3efe052e4.out +++ b/test/expected/test_sessions.sh_e988439404f2e97604641c8d087855f3efe052e4.out @@ -3,8 +3,8 @@ # '|/path/to/this/file' in lnav to execute this file and # restore the state of the session. -;SELECT raise_error('This session export was made with a newer version of lnav, please upgrade to ' || '0.12.1' || ' or later') - WHERE lnav_version() < '0.12.1' COLLATE naturalcase +;SELECT raise_error('This session export was made with a newer version of lnav, please upgrade to ' || '0.12.2' || ' or later') + WHERE lnav_version() < '0.12.2' COLLATE naturalcase # The files loaded into the session were: diff --git a/test/expected/test_sql.sh_859af4cc5f57345be8dcece599419d58f332841a.err b/test/expected/test_sql.sh_859af4cc5f57345be8dcece599419d58f332841a.err new file mode 100644 index 00000000..e69de29b diff --git a/test/expected/test_sql.sh_859af4cc5f57345be8dcece599419d58f332841a.out b/test/expected/test_sql.sh_859af4cc5f57345be8dcece599419d58f332841a.out new file mode 100644 index 00000000..f648fc67 --- /dev/null +++ b/test/expected/test_sql.sh_859af4cc5f57345be8dcece599419d58f332841a.out @@ -0,0 +1,4 @@ +Min: 0   1-23   24-48   49+ Max: 291690 + Thu Nov 03 00:15:00                +▲ 70 values in the range 0.00-3788.18 + Thu Nov 03 00:20:00