aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormerakor <cem@ckyln.com>2021-08-14 13:44:38 +0000
committermerakor <cem@ckyln.com>2021-08-14 13:44:38 +0000
commit3dfc9c3af5de0e17069b0195e416d50a97edbf0b (patch)
treeadd44e1cde4ea73e418055def2a1756a63d5f8bc
parentcb68663adb63f8ba8a0b80d47450053d66ff339a (diff)
parent674c01cb33a9ac229c80209b05f0dcd464a41c05 (diff)
downloadcpt-3dfc9c3af5de0e17069b0195e416d50a97edbf0b.tar.gz
merge cpt-6.2.x
FossilOrigin-Name: 6d1549c62d46ee833d00b3d1a815afd0fadd7f8ac84039f79e5331a4d1142d75
-rw-r--r--CHANGELOG.md4
-rw-r--r--Makefile8
-rwxr-xr-xconfigure1
-rw-r--r--man/cpt-build.16
-rw-r--r--man/cpt-install.16
-rw-r--r--man/cpt-remove.16
-rw-r--r--man/cpt-search.18
7 files changed, 32 insertions, 7 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
diff --git a/Makefile b/Makefile
index b2c7a5f..691caf6 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,15 +29,14 @@ 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
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
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"
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