From 92cd859fd5b7b0f75e40206fdd188b63c3fb946c Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sat, 10 Jun 2023 04:56:55 +0200 Subject: [PATCH] Applied updates --- configure.ac | 2 +- runtests.sh | 14 ++------------ synclibs.sh | 5 +++-- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 96933c3..e4f46d4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.71]) AC_INIT( [libcnotify], - [20230415], + [20230610], [joachim.metz@gmail.com]) AC_CONFIG_SRCDIR( diff --git a/runtests.sh b/runtests.sh index 78560b9..276a2d3 100755 --- a/runtests.sh +++ b/runtests.sh @@ -1,7 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash # Script that runs the tests # -# Version: 20220819 +# Version: 20230507 EXIT_SUCCESS=0; EXIT_FAILURE=1; @@ -358,11 +358,6 @@ then then exit ${EXIT_FAILURE}; fi - - if test -f "setup.py" && ! run_setup_py_tests ${PYTHON2}; - then - exit ${EXIT_FAILURE}; - fi fi # Test with Python 3. @@ -393,11 +388,6 @@ then then exit ${EXIT_FAILURE}; fi - - if test -f "setup.py" && ! run_setup_py_tests ${PYTHON3}; - then - exit ${EXIT_FAILURE}; - fi fi # Test with the default Python version. diff --git a/synclibs.sh b/synclibs.sh index 17345a4..8136e25 100755 --- a/synclibs.sh +++ b/synclibs.sh @@ -1,7 +1,7 @@ #!/bin/sh # Script that synchronizes the local library dependencies # -# Version: 20210513 +# Version: 20230510 EXIT_SUCCESS=0; EXIT_FAILURE=1; @@ -52,7 +52,8 @@ do fi LOCAL_LIB_UPPER=`echo "${LOCAL_LIB}" | tr "[a-z]" "[A-Z]"`; - LOCAL_LIB_VERSION=`grep -A 2 AC_INIT ${LOCAL_LIB}-$$/configure.ac | tail -n 1 | sed 's/^\s*\[\([0-9]*\)\],\s*$/\1/'`; + # Note that sed on FreeBSD does not support \s hence that we use [[:space:]] instead. + LOCAL_LIB_VERSION=`grep -A 2 AC_INIT ${LOCAL_LIB}-$$/configure.ac | tail -n 1 | sed 's/^[[:space:]]*\[\([0-9]*\)\],[[:space:]]*$/\1/'`; LOCAL_LIB_MAKEFILE_AM="${LOCAL_LIB}/Makefile.am"; cp ${LOCAL_LIB}-$$/${LOCAL_LIB}/*.[chly] ${LOCAL_LIB};