Date: Saturday, October 8, 2022 @ 15:51:17 Author: seblu Revision: 1324374
upgpkg: scaleway-cli 2.6.0-1 Added: scaleway-cli/trunk/0001-Disable-online-version-check.patch Modified: scaleway-cli/trunk/PKGBUILD -----------------------------------------+ 0001-Disable-online-version-check.patch | 24 ++++++++++++++++++++++++ PKGBUILD | 12 +++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) Added: 0001-Disable-online-version-check.patch =================================================================== --- 0001-Disable-online-version-check.patch (rev 0) +++ 0001-Disable-online-version-check.patch 2022-10-08 15:51:17 UTC (rev 1324374) @@ -0,0 +1,24 @@ +From 06d7914bd5da89335c95793a3bc1903675f7a3b8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <[email protected]> +Date: Sat, 8 Oct 2022 17:31:34 +0200 +Subject: [PATCH] Disable online version check + +--- + internal/core/build_info.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/internal/core/build_info.go b/internal/core/build_info.go +index c3f7799e..be80db7d 100644 +--- a/internal/core/build_info.go ++++ b/internal/core/build_info.go +@@ -57,6 +57,7 @@ func (b *BuildInfo) GetUserAgent() string { + } + + func (b *BuildInfo) checkVersion(ctx context.Context) { ++ return + if !b.IsRelease() || ExtractEnv(ctx, scwDisableCheckVersionEnv) == "true" { + ExtractLogger(ctx).Debug("skipping check version") + return +-- +2.37.3 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-08 15:50:44 UTC (rev 1324373) +++ PKGBUILD 2022-10-08 15:51:17 UTC (rev 1324374) @@ -3,8 +3,8 @@ # Contributor: Mikkel Oscar Lyderik <mikkeloscar at gmail dot com> pkgname=scaleway-cli -pkgver=2.5.6 -pkgrel=2 +pkgver=2.6.0 +pkgrel=1 pkgdesc='Command line interface for Scaleway Cloud' arch=('x86_64') url='https://www.scaleway.com/en/cli/' @@ -12,9 +12,9 @@ depends=('glibc') makedepends=('go' 'git') source=("git+https://github.com/scaleway/scaleway-cli.git#tag=v$pkgver"; - 'https://github.com/scaleway/scaleway-cli/commit/d244b629192fc62a3e54e673474e34baef7285ec.patch') + '0001-Disable-online-version-check.patch') sha256sums=('SKIP' - '0316f937b36e8fc48d1a250d75528705d647e7888e46257158998772c2767764') + '04ad12a62aa7e9e80707a809e8a800c4b706475fa86a461d99f6791df92b0d2c') prepare() { cd $pkgname @@ -27,6 +27,8 @@ echo "Applying patch $src..." patch -Np1 < "../$src" done + # remove online check tests + rm -f internal/core/build_info_test.go : } @@ -41,7 +43,7 @@ -trimpath \ -mod=readonly \ -modcacherw \ - -ldflags "-linkmode external -extldflags \"${LDFLAGS}\" -X main.Version=$pkgver-$pkgrel -X main.BuildDate=$(date -u '+%Y-%m-%dT%I:%M:%S%p') -X main.DisableVersionCheck=true" \ + -ldflags "-linkmode external -extldflags \"${LDFLAGS}\" -X main.Version=$pkgver-$pkgrel -X main.BuildDate=$(date -u '+%Y-%m-%dT%I:%M:%S%p')" \ -o scw ./cmd/scw/main.go PATH=. scw autocomplete script shell=zsh > zshcomp PATH=. scw autocomplete script shell=bash > bashcomp
