-- cgit v1.2.3 From 2573792c68ee332d0f66d3cf5a5f2a0f7dc9ac10 Mon Sep 17 00:00:00 2001 From: merakor Date: Wed, 11 Aug 2021 13:51:17 +0000 Subject: check download utility FossilOrigin-Name: e82f39e86bb723602534005b43ac148580368c7a2e340bcba1cee3c9d8bc179d --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index a2d0bba..e338b8f 100755 --- a/configure +++ b/configure @@ -107,6 +107,7 @@ out "DOCS = $docs" >>config.mk out "checking runtime dependencies" _check pax rsync sed awk grep b3sum _check_multi "sha256 provider" sha256sum sha256 openssl +_check_multi "download utility" curl wget wget2 aria2c axel trap - EXIT INT out "written config.mk" "Run 'make' to build cpt" -- cgit v1.2.3 From 85abcf955d3a60e23e68aeebef8a52e56884f3d0 Mon Sep 17 00:00:00 2001 From: merakor Date: Wed, 11 Aug 2021 14:25:16 +0000 Subject: Makefile: don't run Makefile if config.mk doesn't exist FossilOrigin-Name: b5faffbadc715e31283c04c543a0df3ff9aa32552f212ff9872b6bb45570cfdc --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b2c7a5f..c424031 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Carbs Packaging Tools --include config.mk +include config.mk INSTALL_SH = ./tools/install.sh CONTRIB = `find contrib -name 'cpt*' ! -name '*.*'` @@ -7,7 +7,6 @@ SRC = `find src -name 'cpt*' ! -name '*.*'` BIN = ${SRC} ${CONTRIB} all: src/cpt-lib - @if ! [ -e config.mk ]; then echo "Please run './configure'"; exit 1; fi @test "${DOCS}" != yes || ${MAKE} -C docs all src/cpt-lib: src/cpt-lib.in @@ -30,7 +29,6 @@ tests/etc/cpt-hook: ln -s ../hook-file $@ dist: docs/cpt.info - @if ! [ -e config.mk ]; then echo "Please run './configure'"; exit 1; fi ./tools/mkdist.sh "${VERSION}" install: all -- cgit v1.2.3 From b50af80f5bfa9bbd70d84bc18fcff9da7bdb99a1 Mon Sep 17 00:00:00 2001 From: merakor Date: Fri, 13 Aug 2021 07:55:07 +0000 Subject: man: update FossilOrigin-Name: 196cb0d7f9c378fe2105e456c5133c37560dcb6a9de41fcdb542fc3a20fbffa1 --- man/cpt-build.1 | 6 ++++++ man/cpt-install.1 | 6 ++++++ man/cpt-remove.1 | 6 ++++++ man/cpt-search.1 | 8 ++++++++ 4 files changed, 26 insertions(+) diff --git a/man/cpt-build.1 b/man/cpt-build.1 index 1393aed..a897bbe 100644 --- a/man/cpt-build.1 +++ b/man/cpt-build.1 @@ -27,6 +27,12 @@ Run tests (if they exist) Force operation .It Fl y , -no-prompt Do not prompt for confirmation +.It Fl -color Ar CPT_COLOR +Enable/disable output color +.Bo +.Sy auto , +always, never, 1, 0 +.Bc .It Fl -root Ar CPT_ROOT Use an alternate root directory .It Fl h , -help diff --git a/man/cpt-install.1 b/man/cpt-install.1 index 235c2df..dfd483c 100644 --- a/man/cpt-install.1 +++ b/man/cpt-install.1 @@ -23,6 +23,12 @@ The options are as follows: Force installation .It Fl y , -no-prompt Do not prompt for confirmation +.It Fl -color Ar CPT_COLOR +Enable/disable output color +.Bo +.Sy auto , +always, never, 1, 0 +.Bc .It Fl -root Ar CPT_ROOT Use an alternate root directory .It Fl h , -help diff --git a/man/cpt-remove.1 b/man/cpt-remove.1 index e4c2e26..6ebc415 100644 --- a/man/cpt-remove.1 +++ b/man/cpt-remove.1 @@ -21,6 +21,12 @@ The options are as follows: Force removal .It Fl y , -no-prompt Do not prompt for confirmation +.It Fl -color Ar CPT_COLOR +Enable/disable output color +.Bo +.Sy auto , +always, never, 1, 0 +.Bc .It Fl -root Ar CPT_ROOT Use an alternate root directory .It Fl h , -help diff --git a/man/cpt-search.1 b/man/cpt-search.1 index 299fed6..6e96954 100644 --- a/man/cpt-search.1 +++ b/man/cpt-search.1 @@ -31,10 +31,18 @@ Run query mode interpreting the given pattern as a fixed string .It Fl o , -others Use the current directory as the package and show other instances of that package. +.It Fl -color Ar CPT_COLOR +Enable/disable output color +.Bo +.Sy auto , +always, never, 1, 0 +.Bc .It Fl h , -help Show help message .It Fl v , -version Print version information +.It Fl -verbose +Be more verbose .El .Pp The program has three modes of operations. The default operation is to search -- cgit v1.2.3 From f8c1e8df47571ca94005f13cdcb2f12ffe3fcb8a Mon Sep 17 00:00:00 2001 From: merakor Date: Fri, 13 Aug 2021 08:04:46 +0000 Subject: Makefile: fix install target FossilOrigin-Name: 09ac753ee6dbfdb7a461cfeb28ba7dfd64e6ec77fb1f7e8dc8af8d5f9215124f --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c424031..691caf6 100644 --- a/Makefile +++ b/Makefile @@ -34,9 +34,9 @@ dist: docs/cpt.info install: all test "${DOCS}" != yes || ${MAKE} -C docs install [ -f docs/cpt.info ] && \ - ${INSTALL_SH} -Dm644 docs/cpt.info ${DESTDIR}${INFODIR}/cpt.info + ${INSTALL_SH} -Dm644 docs/cpt.info ${DESTDIR}${INFODIR}/cpt.info ||: [ -f docs/cpt.txt ] && \ - ${INSTALL_SH} -Dm644 docs/cpt.txt ${DESTDIR}${DOCDIR}/cpt.txt + ${INSTALL_SH} -Dm644 docs/cpt.txt ${DESTDIR}${DOCDIR}/cpt.txt ||: ${INSTALL_SH} -Dm644 CHANGELOG.md ${DESTDIR}${DOCDIR}/CHANGELOG ${INSTALL_SH} -Dm755 -t ${DESTDIR}${BINDIR} ${BIN} ${INSTALL_SH} -Dm644 -t ${DESTDIR}${MAN1} man/*.1 -- cgit v1.2.3 From 8cecbdb7af067a64cbb351a8b4e2e095a1648e93 Mon Sep 17 00:00:00 2001 From: merakor Date: Sat, 14 Aug 2021 10:54:54 +0000 Subject: docs: update FossilOrigin-Name: 22be3cd5975bd93227934b9010d5efbf1a27b23a088aa56ca6eb3d26cb306137 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1a0452..cb61ae1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ this project _somewhat_ adheres to [Semantic Versioning]. [Semantic Versioning]: https://semver.org/spec/v2.0.0.html -[Unreleased] +[6.2.0] - 2021-08-14 -------------------------------------------------------------------------------- ### BLAKE3 checksums @@ -55,7 +55,7 @@ Regular Expression, and is interpreted by `grep`. `cpt-search` also accepts the - Installation now requires to run `./configure`. -6.1.1 - 2021-08-04 +[6.1.1] - 2021-08-04 -------------------------------------------------------------------------------- ### Fixed -- cgit v1.2.3 From 674c01cb33a9ac229c80209b05f0dcd464a41c05 Mon Sep 17 00:00:00 2001 From: merakor Date: Sat, 14 Aug 2021 10:56:49 +0000 Subject: cpt: bump version to 6.2.0 FossilOrigin-Name: 9fd7fc9a12f46ad43a2625cc698115f137e1b39461dafff4d62ddcb97b28a2ce --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index e338b8f..2411f90 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #!/bin/sh -e -version=Fossil +version=6.2.0 die() { printf '%s: %s\n' "${0##*/}" "$*" >&2 -- cgit v1.2.3