File configure.ac changed (mode: 100644) (index 700dd41..28dab14) |
4 |
4 |
|
|
5 |
5 |
AC_PREREQ([2.69]) |
AC_PREREQ([2.69]) |
6 |
6 |
|
|
7 |
|
AC_INIT(hh, 1.13, martin.dvorak@mindforger.com) |
|
8 |
|
AM_INIT_AUTOMAKE(hh, 1.13) |
|
|
7 |
|
AC_INIT(hh, 1.15, martin.dvorak@mindforger.com) |
9 |
8 |
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) |
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) |
10 |
9 |
|
|
11 |
10 |
# Checks for src dir existence. |
# Checks for src dir existence. |
12 |
11 |
AC_CONFIG_SRCDIR([src/hstr.c]) |
AC_CONFIG_SRCDIR([src/hstr.c]) |
13 |
12 |
|
|
|
13 |
|
# Init (no longer takes parameters). |
|
14 |
|
AM_INIT_AUTOMAKE |
|
15 |
|
|
14 |
16 |
# Checks for programs. |
# Checks for programs. |
15 |
17 |
AC_PROG_CC |
AC_PROG_CC |
16 |
18 |
|
|
File dist/1-dist.sh changed (mode: 100755) (index 56ec294..eaa3abd) |
1 |
1 |
#!/bin/bash |
#!/bin/bash |
2 |
2 |
|
|
|
3 |
|
export AUTOMAKE_LIB=`automake --print-libdir` |
|
4 |
|
|
3 |
5 |
./clean.sh |
./clean.sh |
4 |
6 |
|
|
5 |
7 |
cd .. |
cd .. |
|
... |
... |
autoconf |
9 |
11 |
|
|
10 |
12 |
rm -rvf autom*te.cache |
rm -rvf autom*te.cache |
11 |
13 |
|
|
12 |
|
if [ -d /usr/share/automake-1.11 ] |
|
|
14 |
|
if [ -d ${AUTOMAKE_LIB} ] |
13 |
15 |
then |
then |
14 |
|
rm -vf depcomp install-sh missing |
|
15 |
|
cp -vf /usr/share/automake-1.11/depcomp . |
|
16 |
|
cp -vf /usr/share/automake-1.11/install-sh . |
|
17 |
|
cp -vf /usr/share/automake-1.11/missing . |
|
|
16 |
|
rm -vf compile depcomp install-sh missing |
|
17 |
|
cp -vf ${AUTOMAKE_LIB}/compile . |
|
18 |
|
cp -vf ${AUTOMAKE_LIB}/depcomp . |
|
19 |
|
cp -vf ${AUTOMAKE_LIB}/install-sh . |
|
20 |
|
cp -vf ${AUTOMAKE_LIB}/missing . |
|
21 |
|
else |
|
22 |
|
echo "****************************************************************" |
|
23 |
|
echo "Error: automake ${AUTOMAKE_LIB} not found - exiting!" |
|
24 |
|
exit 1 |
18 |
25 |
fi |
fi |
19 |
26 |
|
|
20 |
27 |
cd dist |
cd dist |
File dist/github-env.sh changed (mode: 100755) (index 0cc9b25..72e110e) |
... |
... |
export NOW=`date +%Y-%m-%d--%H-%M-%S` |
4 |
4 |
export GH_RELEASE_DIR=~/p/hstr/release |
export GH_RELEASE_DIR=~/p/hstr/release |
5 |
5 |
export GH_DISTRO_DIR=${GH_RELEASE_DIR}/release-${NOW} |
export GH_DISTRO_DIR=${GH_RELEASE_DIR}/release-${NOW} |
6 |
6 |
|
|
7 |
|
export HHVERSION="1.14" |
|
8 |
|
export GH_MSG="Keyboard search and improved highlighted." |
|
|
7 |
|
export HHVERSION="1.15" |
|
8 |
|
export GH_MSG="Enter first item auto-select, Vim keybinding, doc improvements." |
9 |
9 |
|
|
10 |
10 |
# eof |
# eof |
File dist/github-release.sh changed (mode: 100755) (index 62dc4c0..318be28) |
1 |
1 |
#!/bin/bash |
#!/bin/bash |
2 |
2 |
|
|
|
3 |
|
# update github-env.sh to put there version and release comment |
3 |
4 |
. ./github-env.sh |
. ./github-env.sh |
4 |
5 |
export SCRIPT_HOME=`pwd` |
export SCRIPT_HOME=`pwd` |
5 |
6 |
|
|
6 |
7 |
function make_github_release() { |
function make_github_release() { |
7 |
8 |
cp -vrf ${SCRIPT_HOME}/../../hstr . |
cp -vrf ${SCRIPT_HOME}/../../hstr . |
8 |
9 |
cd hstr && rm -vrf debian doc tests && cd dist && ./1-dist.sh |
cd hstr && rm -vrf debian doc tests && cd dist && ./1-dist.sh |
|
10 |
|
if [ $? -ne 0 ] |
|
11 |
|
then |
|
12 |
|
exit 1; |
|
13 |
|
fi |
9 |
14 |
cd ../.. |
cd ../.. |
10 |
15 |
tar zcfv hh-${HHVERSION}-src.tgz hstr |
tar zcfv hh-${HHVERSION}-src.tgz hstr |
11 |
16 |
cd hstr && ./configure && make && cp src/hh .. |
cd hstr && ./configure && make && cp src/hh .. |
File src/hstr.c changed (mode: 100644) (index d143316..436d442) |
... |
... |
unsigned hstr_make_selection(char *prefix, HistoryItems *history, int maxSelecti |
471 |
471 |
char regexpErrorMessage[CMDLINE_LNG]; |
char regexpErrorMessage[CMDLINE_LNG]; |
472 |
472 |
bool regexpCompilationError=false; |
bool regexpCompilationError=false; |
473 |
473 |
bool keywordsAllMatch; |
bool keywordsAllMatch; |
474 |
|
char *keywordsSavePtr; |
|
|
474 |
|
char *keywordsSavePtr=NULL; |
475 |
475 |
char *keywordsToken; |
char *keywordsToken; |
476 |
476 |
char *keywordsParsedLine; |
char *keywordsParsedLine; |
477 |
477 |
char *keywordsPointerToDelete; |
char *keywordsPointerToDelete; |
|
... |
... |
unsigned hstr_make_selection(char *prefix, HistoryItems *history, int maxSelecti |
514 |
514 |
keywordsParsedLine = strdup(prefix); |
keywordsParsedLine = strdup(prefix); |
515 |
515 |
keywordsAllMatch = true; |
keywordsAllMatch = true; |
516 |
516 |
keywordsPointerToDelete = keywordsParsedLine; |
keywordsPointerToDelete = keywordsParsedLine; |
517 |
|
while (true) { |
|
|
517 |
|
while(true) { |
518 |
518 |
keywordsToken = strtok_r(keywordsParsedLine, " ", &keywordsSavePtr); |
keywordsToken = strtok_r(keywordsParsedLine, " ", &keywordsSavePtr); |
519 |
519 |
keywordsParsedLine = NULL; |
keywordsParsedLine = NULL; |
520 |
520 |
if (keywordsToken == NULL) { |
if (keywordsToken == NULL) { |