From 9152b59527b5fcc5d4de89945b3c40fe49a42ba2 Mon Sep 17 00:00:00 2001 From: Martin Dvorak Date: Mon, 13 Dec 2021 22:07:30 +0100 Subject: [PATCH] Fixing Arch build by fixing bug in mvprintw which resolves #443 --- Changelog | 4 ++++ INSTALLATION.md | 4 ++-- PKGBUILD | 2 +- SECURITY.md | 1 + build/debian/make-deb.sh | 4 ++-- build/fedora/rpm-from-deb.sh | 2 +- build/tarball/tarball-build.sh | 2 +- build/ubuntu/launchpad-make-all-releases.sh | 4 ++-- configure.ac | 2 +- pad.xml | 4 ++-- src/hstr.c | 4 ++-- 11 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Changelog b/Changelog index 21d390f3..817a1e47 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,7 @@ +2021-12-13 Martin Dvorak + + * Released v2.5.0 - minor fix release to fix Arch build. + 2021-12-03 Martin Dvorak * Released v2.4.0 - ability to insert custom command to terminal prompt, diff --git a/INSTALLATION.md b/INSTALLATION.md index 7b62c30a..fdf4e250 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -98,7 +98,7 @@ Alternatively you can download and install `.deb` archive from [GitHub releases] section of the project: ```bash -wget -O hstr.deb https://github.com/dvorka/hstr/releases/download/2.4/hstr_..-1_amd64.deb +wget -O hstr.deb https://github.com/dvorka/hstr/releases/download/./hstr_..-1_amd64.deb # dependencies: apt-get install libncursesw5 libtinfo5 @@ -191,7 +191,7 @@ pkg install hstr To install HSTR on Slackware, please check [pkgs.org](https://pkgs.org/search/?q=hstr). You can install HSTR as follows: ```bash -upgradepkg --install-new hstr-2.4-x86_64-1cf.txz +upgradepkg --install-new hstr-.-x86_64-1cf.txz ``` [Configure](CONFIGURATION.md) HSTR and check its [man page](README.md#documentation). diff --git a/PKGBUILD b/PKGBUILD index 823bb420..9b65ae02 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Busindre pkgname=hstr -pkgver=2.3 +pkgver=2.5 pkgrel=1 pkgdesc="A command line utility that brings improved BASH command completion from the history. It aims to make completion easier and more efficient than Ctrl-r." arch=('any') diff --git a/SECURITY.md b/SECURITY.md index a84fe2a0..93b35a71 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,6 +6,7 @@ The following HSTR versions are currently being supported with security updates. | Version | Supported | | ------- | ------------------ | +| 2.5.0 | :white_check_mark: | | 2.4.0 | :white_check_mark: | | <= 2.3.0 | :x: | diff --git a/build/debian/make-deb.sh b/build/debian/make-deb.sh index e2bcbe46..9662187c 100755 --- a/build/debian/make-deb.sh +++ b/build/debian/make-deb.sh @@ -147,8 +147,8 @@ then exit 1 fi -export ARG_BAZAAR_MSG="HSTR 2.4.0" -export ARG_VERSION="2.4.0" +export ARG_BAZAAR_MSG="HSTR 2.5.0" +export ARG_VERSION="2.5.0" # Debian releases: https://www.debian.org/releases/ # 6/7/8/9/10: squeeze wheezy jessie stretch buster diff --git a/build/fedora/rpm-from-deb.sh b/build/fedora/rpm-from-deb.sh index 8d5e1345..649903c2 100755 --- a/build/fedora/rpm-from-deb.sh +++ b/build/fedora/rpm-from-deb.sh @@ -20,7 +20,7 @@ # This script is available from http://www.mindforger.com/fedora/fedora-rpm-from-deb.sh # to be easily available in VMs -export MFVERSION="2.4.0" +export MFVERSION="2.5.0" export MFPRJNAME="hstr-${MFVERSION}" export AMD64NAME="hstr_${MFVERSION}-1_amd64" export I386NAME="hstr_${MFVERSION}-1_i386" diff --git a/build/tarball/tarball-build.sh b/build/tarball/tarball-build.sh index b1d6d217..154a2246 100755 --- a/build/tarball/tarball-build.sh +++ b/build/tarball/tarball-build.sh @@ -20,7 +20,7 @@ export SCRIPT_HOME=`pwd` -export HSTR_VERSION="2.4.0" +export HSTR_VERSION="2.5.0" export NOW=`date +%Y-%m-%d--%H-%M-%S` export GH_RELEASE_DIR=~/p/hstr/release diff --git a/build/ubuntu/launchpad-make-all-releases.sh b/build/ubuntu/launchpad-make-all-releases.sh index 9d845c3c..6495d07d 100755 --- a/build/ubuntu/launchpad-make-all-releases.sh +++ b/build/ubuntu/launchpad-make-all-releases.sh @@ -163,8 +163,8 @@ then exit 1 fi -export ARG_BAZAAR_MSG="Release 2.4" -export ARG_MAJOR_VERSION=2.4. +export ARG_BAZAAR_MSG="Release 2.5" +export ARG_MAJOR_VERSION=2.5. export ARG_MINOR_VERSION=7 # minor version is incremented for every Ubuntu version # https://wiki.ubuntu.com/Releases diff --git a/configure.ac b/configure.ac index e90d3a75..775c7954 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.69]) -AC_INIT(hstr, 2.4.0, martin.dvorak@mindforger.com) +AC_INIT(hstr, 2.5.0, martin.dvorak@mindforger.com) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) # Check src dir existence. diff --git a/pad.xml b/pad.xml index 8b5d04b6..16c37680 100644 --- a/pad.xml +++ b/pad.xml @@ -51,9 +51,9 @@ HSTR - 2.4.0 + 2.5.0 12 - 3 + 13 2021 USD diff --git a/src/hstr.c b/src/hstr.c index a1dfc2e6..b0ee33f8 100644 --- a/src/hstr.c +++ b/src/hstr.c @@ -137,7 +137,7 @@ // major.minor.revision static const char* VERSION_STRING= - "hstr version \"2.4.0\" (2021-12-03T21:30:00)" + "hstr version \"2.5.0\" (2021-12-13T22:00:00)" "\n"; static const char* HSTR_VIEW_LABELS[]={ @@ -742,7 +742,7 @@ void print_cmd_added_favorite_label(const char* cmd) color_attr_on(COLOR_PAIR(HSTR_COLOR_INFO)); color_attr_on(A_BOLD); } - mvprintw(hstr->promptYNotification, 0, screenLine); + mvprintw(hstr->promptYNotification, 0, "%s", screenLine); if(hstr->theme & HSTR_THEME_COLOR) { color_attr_off(A_BOLD); color_attr_on(COLOR_PAIR(HSTR_COLOR_NORMAL));