瀏覽代碼

Use and cache versioned files for AUR, fix inconsistencies [ci skip]

timvisee 6 年之前
父節點
當前提交
156d5db765
共有 4 個文件被更改,包括 18 次插入18 次删除
  1. 4 4
      .gitlab-ci.yml
  2. 8 8
      pkg/aur/ffsend-bin/PKGBUILD
  3. 3 3
      pkg/aur/ffsend-git/PKGBUILD
  4. 3 3
      pkg/aur/ffsend/PKGBUILD

+ 4 - 4
.gitlab-ci.yml

@@ -271,16 +271,16 @@ package-aur:
     - echo "Determining SHA checksums for remote files..."
     - URL_BIN=https://github.com/timvisee/ffsend/releases/download/v$VERSION/ffsend-v$VERSION-linux-x64-static
     - URL_SOURCE=https://gitlab.com/timvisee/ffsend/-/archive/v$VERSION/ffsend-v$VERSION.tar.gz
-    - BASH_COMPLETION="https://raw.githubusercontent.com/timvisee/ffsend/master/contrib/completions/ffsend.bash"
-    - FISH_COMPLETION="https://raw.githubusercontent.com/timvisee/ffsend/master/contrib/completions/ffsend.fish"
+    - BASH_COMPLETION="https://raw.githubusercontent.com/timvisee/ffsend/v$VERSION/contrib/completions/ffsend.bash"
+    - FISH_COMPLETION="https://raw.githubusercontent.com/timvisee/ffsend/v$VERSION/contrib/completions/ffsend.fish"
     - 'echo "Selected binary URL: $URL_BIN"'
     - 'echo "Selected source URL: $URL_SOURCE"'
     - echo "Determining sha256sum for remote binary..."
     - 'SHA_BIN=$(curl -sSL "$URL_BIN" | sha256sum | cut -d" " -f1)'
     - 'echo "Got sha256sum: $SHA_BIN"'
-    - 'SHA_BASH_COMPLETION=$(curl -sSL "BASH_COMPLETION" | sha256sum | cut -d" " -f1)'
+    - 'SHA_BASH_COMPLETION=$(curl -sSL "$BASH_COMPLETION" | sha256sum | cut -d" " -f1)'
     - 'echo "Got sha256sums of bash completion: $SHA_BASH_COMPLETION"'
-    - 'SHA_FISH_COMPLETION=$(curl -sSL "FISH_COMPLETION" | sha256sum | cut -d" " -f1)'
+    - 'SHA_FISH_COMPLETION=$(curl -sSL "$FISH_COMPLETION" | sha256sum | cut -d" " -f1)'
     - 'echo "Got sha256sums of fish completion: $SHA_FISH_COMPLETION"'
     - echo "Determining sha256sum for remote source..."
     - 'SHA_SOURCE=$(curl -sSL "$URL_SOURCE" | sha256sum | cut -d" " -f1)'

+ 8 - 8
pkg/aur/ffsend-bin/PKGBUILD

@@ -6,14 +6,14 @@
 # - Mirror: https://github.com/timvisee/ffsend/blob/master/pkg/aur/ffsend-bin/PKGBUILD
 
 pkgname=ffsend-bin
-pkgver=0.2.42 # automatically set in CI, see: /.gitlab-ci.yml
+pkgver=0.0.0 # automatically set in CI, see: /.gitlab-ci.yml
 pkgrel=1
 pkgdesc="Easily and securely share files from the command line. A Firefox Send client."
 url="https://gitlab.com/timvisee/ffsend"
 license=('GPL3')
-source=("ffsend-v${pkgver}::https://github.com/timvisee/ffsend/releases/download/v$pkgver/ffsend-v$pkgver-linux-x64-static"
-        "ffsent.bash::https://raw.githubusercontent.com/timvisee/ffsend/master/contrib/completions/ffsend.bash"
-        "ffsend.fish::https://raw.githubusercontent.com/timvisee/ffsend/master/contrib/completions/ffsend.fish") # automatically set in CI, see: /.gitlab-ci.yml
+source=("ffsend-v$pkgver::https://github.com/timvisee/ffsend/releases/download/v$pkgver/ffsend-v$pkgver-linux-x64-static"
+        "ffsend-v$pkgver.bash::https://raw.githubusercontent.com/timvisee/ffsend/v$pkgver/contrib/completions/ffsend.bash"
+        "ffsend-v$pkgver.fish::https://raw.githubusercontent.com/timvisee/ffsend/v$pkgver/contrib/completions/ffsend.fish") # automatically set in CI, see: /.gitlab-ci.yml
 sha256sums=('SKIP')
 arch=('x86_64')
 provides=('ffsend')
@@ -23,12 +23,12 @@ optdepends=('xclip: clipboard support'
             'bash-completion: support auto completion for bash')
 
 package() {
-    cd "${srcdir}"
+    cd "$srcdir"
 
     # Install Binary
-    install -Dm755 "ffsend" "$pkgdir/usr/bin/ffsend"
+    install -Dm755 "ffsend-v$pkgver" "$pkgdir/usr/bin/ffsend"
 
     # Install completions
-    install -Dm644 "ffsend.bash" "${pkgver}/usr/share/bash-completion/completions/ffsend"
-    install -Dm644 "ffsend.fish" "${pkgver}/usr/share/fish/vendor_completions.d/ffsend.fish"
+    install -Dm644 "ffsend-v$pkgver.bash" "$pkgver/usr/share/bash-completion/completions/ffsend"
+    install -Dm644 "ffsend-v$pkgver.fish" "$pkgver/usr/share/fish/vendor_completions.d/ffsend.fish"
 }

+ 3 - 3
pkg/aur/ffsend-git/PKGBUILD

@@ -26,13 +26,13 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/ffsend"
+    cd "$srcdir/ffsend"
 
     # Install Binary
     install -Dm755 "./target/release/ffsend" "$pkgdir/usr/bin/ffsend"
 
     # Install completions
     cd "./contrib/completions"
-    install -Dm644 "ffsend.bash" "${pkgver}/usr/share/bash-completion/completions/ffsend"
-    install -Dm644 "ffsend.fish" "${pkgver}/usr/share/fish/vendor_completions.d/ffsend.fish"
+    install -Dm644 "ffsend.bash" "$pkgver/usr/share/bash-completion/completions/ffsend"
+    install -Dm644 "ffsend.fish" "$pkgver/usr/share/fish/vendor_completions.d/ffsend.fish"
 }

+ 3 - 3
pkg/aur/ffsend/PKGBUILD

@@ -25,13 +25,13 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/ffsend-v${pkgver}"
+    cd "$srcdir/ffsend-v$pkgver"
 
     # Install Binary
     install -Dm755 "./target/release/ffsend" "$pkgdir/usr/bin/ffsend"
 
     # Install completions
     cd "./contrib/completions"
-    install -Dm644 "ffsend.bash" "${pkgver}/usr/share/bash-completion/completions/ffsend"
-    install -Dm644 "ffsend.fish" "${pkgver}/usr/share/fish/vendor_completions.d/ffsend.fish"
+    install -Dm644 "ffsend.bash" "$pkgver/usr/share/bash-completion/completions/ffsend"
+    install -Dm644 "ffsend.fish" "$pkgver/usr/share/fish/vendor_completions.d/ffsend.fish"
 }