diff options
| author | merakor <cem@ckyln.com> | 2021-01-04 11:48:53 +0000 |
|---|---|---|
| committer | merakor <cem@ckyln.com> | 2021-01-04 11:48:53 +0000 |
| commit | bbe90552864d3fa7d06871d9efb366a9314f5398 (patch) | |
| tree | 0d6ed358621aabc55d607602ec6da2c2cb5a1d73 | |
| parent | e9cd6924f6291bd43a95cf0abcbb11f05e09f455 (diff) | |
| parent | 6c4ca6e23d3ac6e511c6982e2557844b538a6a68 (diff) | |
| download | cpt-bbe90552864d3fa7d06871d9efb366a9314f5398.tar.gz | |
Merge branch '5.1.x'
FossilOrigin-Name: 035deb0250c22e7feafad486f8f2b1a40893ad87073c8e41ba4bdc0db0d23d62
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | src/cpt-lib.in | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b2bf5f..6330006 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,15 @@ this project _somewhat_ adheres to [Semantic Versioning]. [Semantic Versioning]: https://semver.org/spec/v2.0.0.html +5.1.2 - 2020-12-24 +-------------------------------------------------------------------------------- + +### Fixed +- Fixed the `Makefile` installing files other than `cpt-*` files. +- Fixed `pkg_swap()` bug where swapping a prefix file would change the following + file locations on the manifest as well. + + 5.1.1 - 2020-12-20 -------------------------------------------------------------------------------- diff --git a/src/cpt-lib.in b/src/cpt-lib.in index 729b178..7728ae8 100644 --- a/src/cpt-lib.in +++ b/src/cpt-lib.in @@ -1363,7 +1363,7 @@ pkg_swap() { # its manifest file to reflect this. We then resort this file # so no issues arise when removing packages. cp -Pf "$CPT_ROOT/$2" "$pkg_owns>${alt#*>}" - sed "s#^$(regesc "$2")#${PWD#$CPT_ROOT}/$pkg_owns>${alt#*>}#" \ + sed "s#^$(regesc "$2")\$#${PWD#$CPT_ROOT}/$pkg_owns>${alt#*>}#" \ "../installed/$pkg_owns/manifest" | sort -r -o "../installed/$pkg_owns/manifest" fi @@ -1371,7 +1371,7 @@ pkg_swap() { # Convert the desired alternative to a real file and rewrite # the manifest file to reflect this. The reverse of above. mv -f "$alt" "$CPT_ROOT/$2" - sed "s#^${PWD#$CPT_ROOT}/$(regesc "$alt")#$2#" "../installed/$1/manifest" | + sed "s#^${PWD#$CPT_ROOT}/$(regesc "$alt")\$#$2#" "../installed/$1/manifest" | sort -r -o "../installed/$1/manifest" } |