Fix merge conflicts

This commit is contained in:
RealStickman 2022-02-05 13:06:43 +01:00
parent 5eeba67835
commit 4796c8ea55
2 changed files with 10 additions and 11 deletions

View File

@ -1,7 +1,7 @@
pkgbase = kopia-ui-bin pkgbase = kopia-ui-bin
pkgdesc = A cross-platform backup-tool with encryption, deduplication, compression and cloud support. pkgdesc = A cross-platform backup-tool with encryption, deduplication, compression and cloud support.
pkgver = 0.10.1 pkgver = 0.10.4
pkgrel = 2 pkgrel = 1
url = https://github.com/kopia/kopia/ url = https://github.com/kopia/kopia/
arch = x86_64 arch = x86_64
arch = aarch64 arch = aarch64
@ -12,10 +12,10 @@ pkgbase = kopia-ui-bin
source = app-update.yml source = app-update.yml
sha256sums = 6e04ed70f54a3d70c22240cd6e4f65df4ad2f3e8aa1608aca20dc91c594bd83b sha256sums = 6e04ed70f54a3d70c22240cd6e4f65df4ad2f3e8aa1608aca20dc91c594bd83b
source_x86_64 = https://github.com/kopia/kopia/releases/download/v0.10.1/kopia-ui_0.10.1_amd64.deb source_x86_64 = https://github.com/kopia/kopia/releases/download/v0.10.1/kopia-ui_0.10.1_amd64.deb
sha256sums_x86_64 = 28be02d3db2285986ae7cb65bd54349257e14e6333e573c2150a0f2d60c6775c sha256sums_x86_64 = 51b5136bb03251bb32fd7292be145c607db7911a6a88edee4c693c93c9df24f6
source_aarch64 = https://github.com/kopia/kopia/releases/download/v0.10.1/kopia-ui_0.10.1_arm64.deb source_aarch64 = https://github.com/kopia/kopia/releases/download/v0.10.1/kopia-ui_0.10.1_arm64.deb
sha256sums_aarch64 = 33564d08c0fdcb5814cd2437a7b505ae8483536dd38ee8d90bc966a84e1db4a3 sha256sums_aarch64 = e5767650e101e496aaf7a9c89ce063f60aa2e09a7e995eb6b5839ad779d083b5
source_armv7h = https://github.com/kopia/kopia/releases/download/v0.10.1/kopia-ui_0.10.1_armv7l.deb source_armv7h = https://github.com/kopia/kopia/releases/download/v0.10.1/kopia-ui_0.10.1_armv7l.deb
sha256sums_armv7h = 5779815d412b22f4a327735b0384ee99e8082ef6cf33f9d6b88fbc624c9a637a sha256sums_armv7h = 518e90abd71f7f2e6ab5877b1f35e41064af0a39ffe68a17493748b6660e6a9b
pkgname = kopia-ui-bin pkgname = kopia-ui-bin

View File

@ -2,10 +2,10 @@
pkgname=kopia-ui-bin pkgname=kopia-ui-bin
pkgdesc='A cross-platform backup-tool with encryption, deduplication, compression and cloud support.' pkgdesc='A cross-platform backup-tool with encryption, deduplication, compression and cloud support.'
pkgver=0.10.1 pkgver=0.10.4
# Uncomment for releases with hyphens # Uncomment for releases with hyphens
# _pkgver=$(echo "$pkgver" | tr '~' -) # _pkgver=$(echo "$pkgver" | tr '~' -)
pkgrel=2 pkgrel=1
arch=('x86_64' 'aarch64' 'armv7h') arch=('x86_64' 'aarch64' 'armv7h')
url='https://github.com/kopia/kopia/' url='https://github.com/kopia/kopia/'
license=('APACHE') license=('APACHE')
@ -16,10 +16,9 @@ source_x86_64=("https://github.com/kopia/kopia/releases/download/v$pkgver/${pkgn
source_aarch64=("https://github.com/kopia/kopia/releases/download/v$pkgver/${pkgname%-bin}_${pkgver}_arm64.deb") source_aarch64=("https://github.com/kopia/kopia/releases/download/v$pkgver/${pkgname%-bin}_${pkgver}_arm64.deb")
source_armv7h=("https://github.com/kopia/kopia/releases/download/v$pkgver/${pkgname%-bin}_${pkgver}_armv7l.deb") source_armv7h=("https://github.com/kopia/kopia/releases/download/v$pkgver/${pkgname%-bin}_${pkgver}_armv7l.deb")
sha256sums=('6e04ed70f54a3d70c22240cd6e4f65df4ad2f3e8aa1608aca20dc91c594bd83b') sha256sums=('6e04ed70f54a3d70c22240cd6e4f65df4ad2f3e8aa1608aca20dc91c594bd83b')
sha256sums_x86_64=('28be02d3db2285986ae7cb65bd54349257e14e6333e573c2150a0f2d60c6775c') sha256sums_x86_64=('51b5136bb03251bb32fd7292be145c607db7911a6a88edee4c693c93c9df24f6')
sha256sums_aarch64=('33564d08c0fdcb5814cd2437a7b505ae8483536dd38ee8d90bc966a84e1db4a3') sha256sums_aarch64=('e5767650e101e496aaf7a9c89ce063f60aa2e09a7e995eb6b5839ad779d083b5')
sha256sums_armv7h=('5779815d412b22f4a327735b0384ee99e8082ef6cf33f9d6b88fbc624c9a637a') sha256sums_armv7h=('518e90abd71f7f2e6ab5877b1f35e41064af0a39ffe68a17493748b6660e6a9b')
package() { package() {
tar -xf data.tar.xz -C "$pkgdir" tar -xf data.tar.xz -C "$pkgdir"
cp app-update.yml "$pkgdir/opt/KopiaUI/resources" cp app-update.yml "$pkgdir/opt/KopiaUI/resources"