diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 19 | ||||
-rw-r--r-- | RELEASENOTES.md | 21 | ||||
-rw-r--r-- | package.patch | 100 |
4 files changed, 78 insertions, 70 deletions
@@ -1,6 +1,6 @@ pkgbase = mulle-bashfunctions pkgdesc = A collection of shell functions - pkgver = 4.1.1 + pkgver = 5.0.3 pkgrel = 1 epoch = 1 url = https://github.com/mulle-nat/mulle-bashfunctions @@ -9,9 +9,9 @@ pkgbase = mulle-bashfunctions groups = mulle-sde-all license = BSD3 depends = bash - source = https://github.com/mulle-nat/mulle-bashfunctions/archive/4.1.1.tar.gz + source = https://github.com/mulle-nat/mulle-bashfunctions/archive/5.0.3.tar.gz source = package.patch - md5sums = 910b840579c70b831efb23d241879ddf - md5sums = ae1135c609e963283f0840afd5d21f86 + md5sums = e1a8f6fbe947b4a2af966bb07fc2e5fa + md5sums = 317ab45061adf8699fca047fabd90db3 pkgname = mulle-bashfunctions @@ -1,6 +1,6 @@ # Maintainer: Jonathan Boyle <programmerfalcon@gmail.com> pkgname=mulle-bashfunctions -pkgver=4.1.1 +pkgver=5.0.3 pkgrel=1 epoch=1 pkgdesc="A collection of shell functions" @@ -10,9 +10,9 @@ license=('BSD3') groups=('mulle-sde-all') depends=('bash') changelog="RELEASENOTES.md" -source=("https://github.com/mulle-nat/mulle-bashfunctions/archive/4.1.1.tar.gz" "package.patch") +source=("https://github.com/mulle-nat/mulle-bashfunctions/archive/5.0.3.tar.gz" "package.patch") noextract=() -md5sums=('910b840579c70b831efb23d241879ddf' 'ae1135c609e963283f0840afd5d21f86') +md5sums=('e1a8f6fbe947b4a2af966bb07fc2e5fa' '317ab45061adf8699fca047fabd90db3') validpgpkeys=() package() { @@ -21,15 +21,16 @@ package() { install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Run Install - cd bin - chmod +x installer - ./installer "${pkgdir}/usr" + chmod +x bin/installer + bin/installer "${pkgdir}/usr" # Move libexec to lib/$pkgname cd "${pkgdir}/usr" - mkdir -p "lib/" - mv libexec/* "lib/" - rm -r libexec + if [ -d "libexec" ]; then + mkdir -p "lib/" + mv libexec/* "lib/" + rm -r libexec + fi } prepare() { diff --git a/RELEASENOTES.md b/RELEASENOTES.md index e47070837cec..5c8b432cd77b 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,6 +1,25 @@ +### 5.0.3 + +* fix installer for (gasp) solaris + +### 5.0.2 + +* Various small improvements + +# 5.0.0 + +* BREAKING change `_parallel` functions to `__parallel` +* `very_short_sleep` can take a microsecond parameter now +* `log_entry` now truncates argument output for readability +* `dir_list_files` can be set to list symlinks only +* mulle-bashfunctions are started now with `'! /usr/bin/env/mulle-bash` +* removed unused functions like concat `(r_concat` stays) +* added self-documenting functionality to mulle-bashfunctions + + ### 4.1.1 -* * add `r_de_camel_case_upcase_identifier` back for backwards compatibility +* add `r_de_camel_case_upcase_identifier` back for backwards compatibility * fix `_remove_file_if_present` ignoring `MULLE_FLAG_EXEKUTOR_DRY_RUN` ## 4.1.0 diff --git a/package.patch b/package.patch index 35adc1ad7e1b..cb88a8b5d598 100644 --- a/package.patch +++ b/package.patch @@ -1,28 +1,31 @@ -diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-all.sh src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-all.sh ---- src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-all.sh 2022-07-12 10:35:08.000000000 +0100 -+++ src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-all.sh 2022-08-01 11:09:46.927637560 +0100 -@@ -2324,7 +2324,7 @@ +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/bin/installer src.mod/mulle-bashfunctions-5.0.3/bin/installer +--- src/mulle-bashfunctions-5.0.3/bin/installer 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/bin/installer 2023-04-04 17:48:44.540576844 +0100 +@@ -184,7 +184,7 @@ prefix="${RVAL}" + bin="${prefix}/bin" +- libexec="${prefix}/libexec/mulle-bashfunctions/${PROJECT_VERSION}" ++ libexec="${prefix}/lib/mulle-bashfunctions/${PROJECT_VERSION}" + share="${prefix}/share/mulle-bashfunctions/${PROJECT_VERSION}" -- RVAL="${prefix}/libexec/${subdir}" -+ RVAL="${prefix}/lib/${subdir}" - if [ ! -f "${RVAL}/${matchfile}" ] - then - RVAL="${exedirpath}/src" -@@ -2345,7 +2345,7 @@ + mkdir -p "${bin}" || installer_fail "could not create ${bin}" +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/mulle-bash src.mod/mulle-bashfunctions-5.0.3/mulle-bash +--- src/mulle-bashfunctions-5.0.3/mulle-bash 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/mulle-bash 2023-04-04 17:48:14.690665058 +0100 +@@ -674,7 +674,7 @@ - if [ ! -f "${RVAL}/${matchfile}" ] + local libexec_dir + +- libexec_dir="${prefix}/libexec/mulle-bashfunctions" ++ libexec_dir="${prefix}/lib/mulle-bashfunctions" + + if [ ! -z "${qualifier}" ] then -- printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" libexec (${PWD#${MULLE_USER_PWD}/})" >&2 -+ printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" lib (${PWD#${MULLE_USER_PWD}/})" >&2 - exit 1 - fi - } -diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-embed.sh src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-embed.sh ---- src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-embed.sh 2022-07-12 10:35:08.000000000 +0100 -+++ src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-embed.sh 2022-08-01 11:09:46.934304219 +0100 -@@ -2139,7 +2139,7 @@ +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-all.sh src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-all.sh +--- src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-all.sh 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-all.sh 2023-04-04 17:50:15.460329901 +0100 +@@ -2210,7 +2210,7 @@ prefix="${RVAL}" @@ -31,19 +34,10 @@ diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/s if [ ! -f "${RVAL}/${matchfile}" ] then RVAL="${exedirpath}/src" -@@ -2160,7 +2160,7 @@ - - if [ ! -f "${RVAL}/${matchfile}" ] - then -- printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" libexec (${PWD#${MULLE_USER_PWD}/})" >&2 -+ printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" lib (${PWD#${MULLE_USER_PWD}/})" >&2 - exit 1 - fi - } -diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-minimal.sh src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-minimal.sh ---- src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-minimal.sh 2022-07-12 10:35:08.000000000 +0100 -+++ src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-minimal.sh 2022-08-01 11:09:46.940970880 +0100 -@@ -2324,7 +2324,7 @@ +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-embed.sh src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-embed.sh +--- src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-embed.sh 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-embed.sh 2023-04-04 17:49:44.427077392 +0100 +@@ -2025,7 +2025,7 @@ prefix="${RVAL}" @@ -52,19 +46,10 @@ diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/s if [ ! -f "${RVAL}/${matchfile}" ] then RVAL="${exedirpath}/src" -@@ -2345,7 +2345,7 @@ - - if [ ! -f "${RVAL}/${matchfile}" ] - then -- printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" libexec (${PWD#${MULLE_USER_PWD}/})" >&2 -+ printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" lib (${PWD#${MULLE_USER_PWD}/})" >&2 - exit 1 - fi - } -diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions.sh src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions.sh ---- src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions.sh 2022-07-12 10:35:08.000000000 +0100 -+++ src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions.sh 2022-08-01 11:09:46.914304241 +0100 -@@ -2324,7 +2324,7 @@ +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-minimal.sh src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-minimal.sh +--- src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-minimal.sh 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-minimal.sh 2023-04-04 17:50:41.263598596 +0100 +@@ -2210,7 +2210,7 @@ prefix="${RVAL}" @@ -73,19 +58,22 @@ diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/s if [ ! -f "${RVAL}/${matchfile}" ] then RVAL="${exedirpath}/src" -@@ -2345,7 +2345,7 @@ +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions.sh src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions.sh +--- src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions.sh 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions.sh 2023-04-04 17:50:59.760220253 +0100 +@@ -2210,7 +2210,7 @@ + prefix="${RVAL}" + +- RVAL="${prefix}/libexec/${subdir}" ++ RVAL="${prefix}/lib/${subdir}" if [ ! -f "${RVAL}/${matchfile}" ] then -- printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" libexec (${PWD#${MULLE_USER_PWD}/})" >&2 -+ printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" lib (${PWD#${MULLE_USER_PWD}/})" >&2 - exit 1 - fi - } -diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/src/mulle-init.sh src.mod/mulle-bashfunctions-4.1.1/src/mulle-init.sh ---- src/mulle-bashfunctions-4.1.1/src/mulle-init.sh 2022-07-12 10:35:08.000000000 +0100 -+++ src.mod/mulle-bashfunctions-4.1.1/src/mulle-init.sh 2022-08-01 11:04:21.128004584 +0100 -@@ -155,7 +155,7 @@ + RVAL="${exedirpath}/src" +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/src/mulle-init.sh src.mod/mulle-bashfunctions-5.0.3/src/mulle-init.sh +--- src/mulle-bashfunctions-5.0.3/src/mulle-init.sh 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/src/mulle-init.sh 2023-04-04 17:49:07.930510298 +0100 +@@ -178,7 +178,7 @@ # now setup the global variable |