azure-cli -> python-azure-cli

5 files changed, 31 insertions, 51 deletions

diff --git a/azure-cli/.gitignore b/azure-cli/.gitignore
deleted file mode 100644
index 5da1f1db3..000000000
--- a/azure-cli/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-install-*.py
diff --git a/azure-cli/PKGBUILD b/azure-cli/PKGBUILD
deleted file mode 100644
index 5a8b07f9f..000000000
--- a/azure-cli/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Erich Eckner <arch at eckner dot net>
-# Contributor: pallxk <aur@pallxk.com>
-# https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux
-
-pkgname=azure-cli
-pkgver=2.28.1
-pkgrel=1
-pkgdesc="Command-line tools for Azure."
-arch=('any')
-url="https://github.com/Azure/azure-cli"
-license=('MIT')
-depends=("python")
-conflicts=("python-azure-cli")
-source=("install-$pkgver.py::https://raw.githubusercontent.com/Azure/azure-cli/azure-cli-$pkgver/scripts/curl_install_pypi/install.py"
-        "install.response"
-        "az")
-sha256sums=('c5107b96cfe881c46c8d8d9f401fcf931aab2b769a20fda58626b6e6e907219b'
-            '7c05e9915a52fb72fa8d1c498b173c42457d669351313eaddccf43f86ed0e0ec'
-            '990f70efec828c1e1f3f57748fc6e40f9705f2223dc96683e8e29d118daac116')
-options=(!strip)
-
-prepare() {
-  rm -rf "$srcdir/azure-cli"
-  grep -v -E '^===>|^$' install.response | python "$srcdir/install-$pkgver.py"
-  find "$srcdir/azure-cli/bin" -type f -print0 | xargs -0 sed -i -e "s|$srcdir|/opt|g"
-}
-
-pkgver() {
-  # Make sure we have a writable $HOME/.azure directory to run az
-  HOME=$srcdir "$srcdir/bin/az" --version 2> /dev/null | head -1 | tr -c -d 0-9.
-}
-
-package() {
-  mkdir "$pkgdir/opt"
-  cp -r azure-cli "$pkgdir/opt"
-
-  mkdir -p "$pkgdir/usr/bin"
-  install -Dm755 az "$pkgdir/usr/bin"
-
-  install -Dm644 "$pkgdir/opt/azure-cli/az.completion" \
-    "$pkgdir/etc/bash_completion.d/azure-cli"
-}
diff --git a/azure-cli/install.response b/azure-cli/install.response
deleted file mode 100644
index 346b205a8..000000000
--- a/azure-cli/install.response
+++ /dev/null
@@ -1,8 +0,0 @@
-===> In what directory would you like to place the install? (leave blank to use '~/lib/azure-cli'):
-./azure-cli
-
-===> In what directory would you like to place the 'az' executable? (leave blank to use '~/bin'):
-./bin
-
-===> Modify profile to update your $PATH and enable shell/tab completion now? (Y/n):
-n
diff --git a/python-azure-cli/PKGBUILD b/python-azure-cli/PKGBUILD
new file mode 100644
index 000000000..4c11c9974
--- /dev/null
+++ b/python-azure-cli/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Erich Eckner <arch at eckner dot net>
+pkgname=python-azure-cli
+_pkgname="${pkgname#*-}"
+pkgver=2.28.1
+pkgrel=1
+pkgdesc='Microsoft Azure CLI'
+arch=('any')
+url='https://pypi.org/project/azure-cli/'
+license=('MIT')
+depends=(
+  'python<3.10'
+  'python>=3.9')
+makedepends=(
+  'python-setuptools')
+source=(
+    "https://files.pythonhosted.org/packages/9e/6b/b94f437f6b9a2ed33847623f2988ae4291c999793e7fb1a609fb5edb68b7/${_pkgname}-${pkgver}.tar.gz"
+    az
+)
+sha512sums=('81a0953526b4d9b16d2dabe5db6d4187a15c1c9c8ac9660c93f9ac9f9fc136c897135f943632aaa5b40c9ed1f613537b6d8c07c18aa10b41c2ead931260d96c9'
+            '94a9d3daeced17fccae9cb94638a82db0515e4c7fd6b8bbe68f9b428dc84c19a6c956a809c160083e040180914665a3980c257e9f210c431c8d46d574bf113ba')
+
+build() {
+  cd "${_pkgname}-${pkgver}"
+  python setup.py build
+}
+
+package() {
+  cd "${_pkgname}-${pkgver}"
+  python setup.py install --skip-build --root="${pkgdir}" --prefix=/usr
+  install -m755 -t "${pkgdir}/usr/bin" "${srcdir}/az"
+}
diff --git a/azure-cli/az b/python-azure-cli/az
index 575f87a0a..575f87a0a 100755
--- a/azure-cli/az
+++ b/python-azure-cli/az