From e472f310ce22e6726391142d4b9a53705853452a Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Wed, 3 Nov 2021 11:14:42 +0300 Subject: Initial commit, 0.3.1 --- .SRCINFO | 12 ++++++++++++ .gitignore | 3 +++ PKGBUILD | 29 +++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 .SRCINFO create mode 100644 .gitignore create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..4aea0eb --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,12 @@ +pkgbase = ouch + pkgdesc = Painless compression and decompression in the terminal + pkgver = 0.3.1 + pkgrel = 1 + url = https://github.com/ouch-org/ouch + arch = x86_64 + license = MIT + makedepends = cargo + source = ouch-0.3.1.tar.gz::https://github.com/ouch-org/ouch/archive/0.3.1.tar.gz + sha256sums = 269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d + +pkgname = ouch diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1d65adf --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +* +!PKGBUILD +!.SRCINFO diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..6d00377 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Yigit Sever + +pkgname=ouch +pkgver=0.3.1 +pkgrel=1 +pkgdesc="Painless compression and decompression in the terminal" +arch=('x86_64') +url="https://github.com/ouch-org/ouch" +license=('MIT') +makedepends=('cargo') +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") +sha256sums=('269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d') + +prepare() { + cd "$pkgname-$pkgver" + cargo fetch --locked --target "$CARCH-unknown-linux-gnu" +} + +build() { + cd "$pkgname-$pkgver" + export RUSTUP_TOOLCHAIN=stable + export CARGO_TARGET_DIR=target + cargo build --frozen --release --all-features +} + +package() { + cd "$pkgname-$pkgver" + install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname" +} -- cgit v1.2.3-70-g09d2 From 22b31065aef12ec6b836857f563d7b6a4d33aeeb Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Wed, 3 Nov 2021 12:20:14 +0300 Subject: Run tests and install completions Upstream builds completions during compilation --- .SRCINFO | 3 ++- PKGBUILD | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4aea0eb..47f9d8a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,11 +1,12 @@ pkgbase = ouch pkgdesc = Painless compression and decompression in the terminal pkgver = 0.3.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/ouch-org/ouch arch = x86_64 license = MIT makedepends = cargo + conflicts = ouch-git source = ouch-0.3.1.tar.gz::https://github.com/ouch-org/ouch/archive/0.3.1.tar.gz sha256sums = 269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d diff --git a/PKGBUILD b/PKGBUILD index 6d00377..417d414 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,12 +2,13 @@ pkgname=ouch pkgver=0.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Painless compression and decompression in the terminal" arch=('x86_64') url="https://github.com/ouch-org/ouch" license=('MIT') makedepends=('cargo') +conflicts=(${pkgname}-git) source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") sha256sums=('269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d') @@ -20,10 +21,23 @@ build() { cd "$pkgname-$pkgver" export RUSTUP_TOOLCHAIN=stable export CARGO_TARGET_DIR=target - cargo build --frozen --release --all-features + GEN_COMPLETIONS=1 cargo build --frozen --release --all-features +} + +check() { + cd "$pkgname-$pkgver" + export RUSTUP_TOOLCHAIN=stable + cargo test --frozen --all-features } package() { cd "$pkgname-$pkgver" install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname" + + cd target/release/build/ouch-*/out/completions + sed -i "s/':output -- The resulting file. It's extensions can be used to specify the compression formats:_files'/\":output -- The resulting file. It's extensions can be used to specify the compression formats:_files\"/" _ouch + + install -Dm0644 ${pkgname}.bash "${pkgdir}/usr/share/bash-completion/completions/${pkgname}" + install -Dm0644 ${pkgname}.fish "${pkgdir}/usr/share/fish/vendor_completions.d/${pkgname}.fish" + install -Dm0644 _${pkgname} "${pkgdir}/usr/share/zsh/site-functions/_${pkgname}" } -- cgit v1.2.3-70-g09d2 From 18c0df690607f56c2ccb7dcf23a03e6df8a15f9e Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Wed, 3 Nov 2021 20:18:51 +0300 Subject: Add new conflict, install license --- .SRCINFO | 3 ++- PKGBUILD | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 47f9d8a..37e0570 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,13 @@ pkgbase = ouch pkgdesc = Painless compression and decompression in the terminal pkgver = 0.3.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/ouch-org/ouch arch = x86_64 license = MIT makedepends = cargo conflicts = ouch-git + conflicts = ouch-bin source = ouch-0.3.1.tar.gz::https://github.com/ouch-org/ouch/archive/0.3.1.tar.gz sha256sums = 269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d diff --git a/PKGBUILD b/PKGBUILD index 417d414..5d3f5fa 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,37 +2,39 @@ pkgname=ouch pkgver=0.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Painless compression and decompression in the terminal" arch=('x86_64') url="https://github.com/ouch-org/ouch" license=('MIT') makedepends=('cargo') -conflicts=(${pkgname}-git) +conflicts=(${pkgname}-git ${pkgname}-bin) source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") sha256sums=('269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d') prepare() { - cd "$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" cargo fetch --locked --target "$CARCH-unknown-linux-gnu" } build() { - cd "$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" export RUSTUP_TOOLCHAIN=stable export CARGO_TARGET_DIR=target GEN_COMPLETIONS=1 cargo build --frozen --release --all-features } check() { - cd "$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" export RUSTUP_TOOLCHAIN=stable cargo test --frozen --all-features } package() { - cd "$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" + install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" cd target/release/build/ouch-*/out/completions sed -i "s/':output -- The resulting file. It's extensions can be used to specify the compression formats:_files'/\":output -- The resulting file. It's extensions can be used to specify the compression formats:_files\"/" _ouch -- cgit v1.2.3-70-g09d2 From d961ecc84171983b23f63a06dfd2fd6202396718 Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Sun, 21 Aug 2022 00:37:04 +0300 Subject: fix archive url --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 37e0570..7d41ba1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,14 +1,14 @@ pkgbase = ouch pkgdesc = Painless compression and decompression in the terminal pkgver = 0.3.1 - pkgrel = 3 + pkgrel = 4 url = https://github.com/ouch-org/ouch arch = x86_64 license = MIT makedepends = cargo conflicts = ouch-git conflicts = ouch-bin - source = ouch-0.3.1.tar.gz::https://github.com/ouch-org/ouch/archive/0.3.1.tar.gz + source = ouch-0.3.1.tar.gz::https://github.com/ouch-org/ouch/archive/refs/tags/0.3.1.tar.gz sha256sums = 269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d pkgname = ouch diff --git a/PKGBUILD b/PKGBUILD index 5d3f5fa..e83ee41 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,14 +2,14 @@ pkgname=ouch pkgver=0.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Painless compression and decompression in the terminal" arch=('x86_64') url="https://github.com/ouch-org/ouch" license=('MIT') makedepends=('cargo') conflicts=(${pkgname}-git ${pkgname}-bin) -source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/${pkgver}.tar.gz") sha256sums=('269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d') prepare() { -- cgit v1.2.3-70-g09d2 From be7040f40db7248b17e61cd18aa1d92fe85473c9 Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Thu, 24 Nov 2022 04:01:43 +0300 Subject: Update to 0.4.0 --- .SRCINFO | 8 ++++---- PKGBUILD | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7d41ba1..8a9519e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,14 +1,14 @@ pkgbase = ouch pkgdesc = Painless compression and decompression in the terminal - pkgver = 0.3.1 - pkgrel = 4 + pkgver = 0.4.0 + pkgrel = 1 url = https://github.com/ouch-org/ouch arch = x86_64 license = MIT makedepends = cargo conflicts = ouch-git conflicts = ouch-bin - source = ouch-0.3.1.tar.gz::https://github.com/ouch-org/ouch/archive/refs/tags/0.3.1.tar.gz - sha256sums = 269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d + source = ouch-0.4.0.tar.gz::https://github.com/ouch-org/ouch/archive/refs/tags/0.4.0.tar.gz + sha256sums = 3e126f00e1ad82ef4abfd28f86dac53b366a29de6a70359e734ecc8748f580fc pkgname = ouch diff --git a/PKGBUILD b/PKGBUILD index e83ee41..66ff64c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Yigit Sever pkgname=ouch -pkgver=0.3.1 -pkgrel=4 +pkgver=0.4.0 +pkgrel=1 pkgdesc="Painless compression and decompression in the terminal" arch=('x86_64') url="https://github.com/ouch-org/ouch" @@ -10,7 +10,7 @@ license=('MIT') makedepends=('cargo') conflicts=(${pkgname}-git ${pkgname}-bin) source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/${pkgver}.tar.gz") -sha256sums=('269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d') +sha256sums=('3e126f00e1ad82ef4abfd28f86dac53b366a29de6a70359e734ecc8748f580fc') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -21,7 +21,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" export RUSTUP_TOOLCHAIN=stable export CARGO_TARGET_DIR=target - GEN_COMPLETIONS=1 cargo build --frozen --release --all-features + GEN_COMPLETIONS=1 OUCH_ARTIFACTS_FOLDER=artifacts cargo build --frozen --release --all-features } check() { @@ -36,10 +36,16 @@ package() { install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - cd target/release/build/ouch-*/out/completions - sed -i "s/':output -- The resulting file. It's extensions can be used to specify the compression formats:_files'/\":output -- The resulting file. It's extensions can be used to specify the compression formats:_files\"/" _ouch + cd "$srcdir/$pkgname-$pkgver/artifacts" - install -Dm0644 ${pkgname}.bash "${pkgdir}/usr/share/bash-completion/completions/${pkgname}" - install -Dm0644 ${pkgname}.fish "${pkgdir}/usr/share/fish/vendor_completions.d/${pkgname}.fish" - install -Dm0644 _${pkgname} "${pkgdir}/usr/share/zsh/site-functions/_${pkgname}" + # install manpages + install -Dm0644 "${pkgname}.1" -t "${pkgdir}/usr/share/man/man1" + install -Dm0644 "${pkgname}-compress.1" -t "${pkgdir}/usr/share/man/man1" + install -Dm0644 "${pkgname}-decompress.1" -t "${pkgdir}/usr/share/man/man1" + install -Dm0644 "${pkgname}-list.1" -t "${pkgdir}/usr/share/man/man1" + + # install shell completions + install -Dm0644 "${pkgname}.bash" "${pkgdir}/usr/share/bash-completion/completions/${pkgname}" + install -Dm0644 "${pkgname}.fish" "${pkgdir}/usr/share/fish/vendor_completions.d/${pkgname}.fish" + install -Dm0644 "_${pkgname}" "${pkgdir}/usr/share/zsh/site-functions/_${pkgname}" } -- cgit v1.2.3-70-g09d2 From dfe06f1bb10e81a16487fd37e13043254d8ce0e9 Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Sun, 27 Nov 2022 12:22:03 +0300 Subject: remove unused cmd option, don't use nightly --- .SRCINFO | 2 +- PKGBUILD | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8a9519e..27bd7fc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ouch pkgdesc = Painless compression and decompression in the terminal pkgver = 0.4.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/ouch-org/ouch arch = x86_64 license = MIT diff --git a/PKGBUILD b/PKGBUILD index 66ff64c..0d3cfee 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=ouch pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Painless compression and decompression in the terminal" arch=('x86_64') url="https://github.com/ouch-org/ouch" @@ -14,6 +14,8 @@ sha256sums=('3e126f00e1ad82ef4abfd28f86dac53b366a29de6a70359e734ecc8748f580fc') prepare() { cd "$srcdir/$pkgname-$pkgver" + # TODO: Remove on next release <27-11-22, yigit> # + rm -f rust-toolchain cargo fetch --locked --target "$CARCH-unknown-linux-gnu" } @@ -21,7 +23,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" export RUSTUP_TOOLCHAIN=stable export CARGO_TARGET_DIR=target - GEN_COMPLETIONS=1 OUCH_ARTIFACTS_FOLDER=artifacts cargo build --frozen --release --all-features + OUCH_ARTIFACTS_FOLDER=artifacts cargo build --frozen --release --all-features } check() { -- cgit v1.2.3-70-g09d2