From 13df3bf1663af03bd15f7e07fe585cc2094821a2 Mon Sep 17 00:00:00 2001 From: Martin Dvorak Date: Tue, 18 Apr 2023 23:10:27 +0200 Subject: [PATCH] Fixing no TIOCSTI function for Bash which resolves #485 + getting ready for 3.1.0 release --- Changelog | 5 +++++ 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 ++-- hstr.pro | 2 +- pad.xml | 4 ++-- src/hstr.c | 5 ++--- 10 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Changelog b/Changelog index c85ced1..6d64e3b 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,8 @@ +2023-04-18 Martin Dvorak + + * Released v3.1.0 - minor release which fixes Bash function that is used + when ioctl/TIOCSTI is not available. + 2023-04-15 Martin Dvorak * Released v3.0.0 - major release which adds ability of HSTR to work diff --git a/PKGBUILD b/PKGBUILD index 2084371..71cd6a2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Busindre pkgname=hstr -pkgver=3.0 +pkgver=3.1 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=('x86_64' diff --git a/SECURITY.md b/SECURITY.md index d251f1c..db3fdfc 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,6 +6,7 @@ The following HSTR versions are currently being supported with security updates. | Version | Supported | | -------- | ------------------ | +| 3.1.0 | :white_check_mark: | | 3.0.0 | :white_check_mark: | | 2.6.0 | :white_check_mark: | | 2.5.0 | :white_check_mark: | diff --git a/build/debian/make-deb.sh b/build/debian/make-deb.sh index 1be1a11..d32351b 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 3.0.0" -export ARG_VERSION="3.0.0" +export ARG_BAZAAR_MSG="HSTR 3.1.0" +export ARG_VERSION="3.1.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 674f2b0..297a3d6 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="3.0.0" +export MFVERSION="3.1.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 eb2eae6..b1e0efa 100755 --- a/build/tarball/tarball-build.sh +++ b/build/tarball/tarball-build.sh @@ -20,7 +20,7 @@ export SCRIPT_HOME=`pwd` -export HSTR_VERSION="3.0.0" +export HSTR_VERSION="3.1.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 873eab9..5955c51 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 3.0" -export ARG_MAJOR_VERSION=3.0. +export ARG_BAZAAR_MSG="Release 3.1" +export ARG_MAJOR_VERSION=3.1. export ARG_MINOR_VERSION=1 # minor version is incremented for every Ubuntu version # https://wiki.ubuntu.com/Releases diff --git a/hstr.pro b/hstr.pro index a125497..199d507 100644 --- a/hstr.pro +++ b/hstr.pro @@ -62,6 +62,6 @@ hstrdebug { QMAKE_LINK = gcc # TIOCSTI debugging: -# DEFINES += DEBUG_NO_TIOCSTI +DEFINES += DEBUG_NO_TIOCSTI message(DEFINES of hstr.pro build: $$DEFINES) diff --git a/pad.xml b/pad.xml index 80e2cae..2b7c3fd 100644 --- a/pad.xml +++ b/pad.xml @@ -51,9 +51,9 @@ HSTR - 3.0.0 + 3.1.0 4 - 2 + 18 2023 USD diff --git a/src/hstr.c b/src/hstr.c index 4e3f588..8183031 100644 --- a/src/hstr.c +++ b/src/hstr.c @@ -137,7 +137,7 @@ // major.minor.revision static const char* VERSION_STRING= - "hstr version \"3.0.0\" (2023-04-15T08:50:00)" + "hstr version \"3.1.0\" (2023-04-18T08:50:00)" "\n"; static const char* HSTR_VIEW_LABELS[]={ @@ -364,8 +364,7 @@ void print_bash_install_code(void) #else "\nfunction hstrnotiocsti {" #endif - "\n { HSTR_OUT=\"$( { &1 1>&3 3>&- )\"; } 3>&1;" - "\n READLINE_LINE=\"$(hstr ${READLINE_LINE})\"" + "\n { READLINE_LINE=\"$( { &1 1>&3 3>&- )\"; } 3>&1;" "\n READLINE_POINT=${#READLINE_LINE}" "\n}" "\n# if this is interactive shell, then bind hstr to Ctrl-r (for Vi mode check doc)"