Fixing no TIOCSTI function for Bash which resolves #485 + getting ready for 3.1.0 release

This commit is contained in:
Martin Dvorak 2023-04-18 23:10:27 +02:00
parent e1ba44a4e8
commit 13df3bf166
10 changed files with 18 additions and 13 deletions

View file

@ -1,3 +1,8 @@
2023-04-18 Martin Dvorak <martin.dvorak@mindforger.com>
* Released v3.1.0 - minor release which fixes Bash function that is used
when ioctl/TIOCSTI is not available.
2023-04-15 Martin Dvorak <martin.dvorak@mindforger.com>
* Released v3.0.0 - major release which adds ability of HSTR to work

View file

@ -4,7 +4,7 @@
# Contributor: Busindre <busilezas at busindre.com>
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'

View file

@ -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: |

View file

@ -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

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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)

View file

@ -51,9 +51,9 @@
</Company_Info>
<Program_Info>
<Program_Name>HSTR</Program_Name>
<Program_Version>3.0.0</Program_Version>
<Program_Version>3.1.0</Program_Version>
<Program_Release_Month>4</Program_Release_Month>
<Program_Release_Day>2</Program_Release_Day>
<Program_Release_Day>18</Program_Release_Day>
<Program_Release_Year>2023</Program_Release_Year>
<Program_Cost_Dollars />
<Program_Cost_Other_Code>USD</Program_Cost_Other_Code>

View file

@ -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=\"$( { </dev/tty hstr ${READLINE_LINE}; } 2>&1 1>&3 3>&- )\"; } 3>&1;"
"\n READLINE_LINE=\"$(hstr ${READLINE_LINE})\""
"\n { READLINE_LINE=\"$( { </dev/tty hstr ${READLINE_LINE}; } 2>&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)"