Take over as maintainer, and change how sources are downloaded/extracted

2 files changed, 24 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e32931741178..04b6c9e35f8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,14 +23,13 @@ pkgbase = vscodium-bin
 	provides = code
 	conflicts = code
 	conflicts = vscode
-	noextract = vscodium-bin-1.49.1-1-unknown.tar.gz
 	source = vscodium-bin.desktop
 	sha256sums = 65e6b053e6d8be61763801312ded64a82cf835d77a6eabe1b9d7eb9e87b2e49b
-	source_x86_64 = vscodium-bin-1.49.1-1-x64.tar.gz::https://github.com/VSCodium/vscodium/releases/download/1.49.1/VSCodium-linux-x64-1.49.1.tar.gz
+	source_x86_64 = vscodium-bin-1.49.1.tar.gz::https://github.com/VSCodium/vscodium/releases/download/1.49.1/VSCodium-linux-x64-1.49.1.tar.gz
 	sha256sums_x86_64 = e47a97b8038424cbe1f586034be7b2fb46c65fd010ef94727d7785f7831c6183
-	source_aarch64 = vscodium-bin-1.49.1-1-arm64.tar.gz::https://github.com/VSCodium/vscodium/releases/download/1.49.1/VSCodium-linux-arm64-1.49.1.tar.gz
+	source_aarch64 = vscodium-bin-1.49.1.tar.gz::https://github.com/VSCodium/vscodium/releases/download/1.49.1/VSCodium-linux-arm64-1.49.1.tar.gz
 	sha256sums_aarch64 = e9d8a5742454ef0ea27ce8b0675a77d8d06eb16638be2aaa20972abe19b15cf3
-	source_armv7h = vscodium-bin-1.49.1-1-arm.tar.gz::https://github.com/VSCodium/vscodium/releases/download/1.49.1/VSCodium-linux-arm-1.49.1.tar.gz
+	source_armv7h = vscodium-bin-1.49.1.tar.gz::https://github.com/VSCodium/vscodium/releases/download/1.49.1/VSCodium-linux-arm-1.49.1.tar.gz
 	sha256sums_armv7h = 6534d7b10b13a1effadf408899c90a23a8a499298d686a3e8e74535c186a6b65
 
 pkgname = vscodium-bin
diff --git a/PKGBUILD b/PKGBUILD
index 07c39064b964..59f1a8595ca4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,10 @@
-# Maintainer: Plague-doctor <plague <at>> privacyrequired <<dot>> com >
+# Maintainer: Cameron Katri <katri.cameron@gmail.com>
+# Contributor: Plague-doctor <plague <at>> privacyrequired <<dot>> com >
 # Contributor: me at oguzkaganeren dot com dot tr
 # Contributor: Rowisi < nomail <at> private <dot> com >
 
 pkgname=vscodium-bin
+_pkgname=VSCodium
 pkgver=1.49.1
 pkgrel=1
 pkgdesc="Binary releases of VS Code without MS branding/telemetry/licensing."
@@ -20,38 +22,28 @@ optdepends=(
 provides=('code')
 conflicts=('code' 'vscode')
 
-sha256sums_x86_64=('e47a97b8038424cbe1f586034be7b2fb46c65fd010ef94727d7785f7831c6183')
-sha256sums_aarch64=('e9d8a5742454ef0ea27ce8b0675a77d8d06eb16638be2aaa20972abe19b15cf3')
-sha256sums_armv7h=('6534d7b10b13a1effadf408899c90a23a8a499298d686a3e8e74535c186a6b65')
-
-source=(vscodium-bin.desktop)
 sha256sums=('65e6b053e6d8be61763801312ded64a82cf835d77a6eabe1b9d7eb9e87b2e49b')
-source_x86_64=("${pkgname}-${pkgver}-${pkgrel}-x64.tar.gz::${url}/releases/download/${pkgver}/VSCodium-linux-x64-${pkgver}.tar.gz")
-source_aarch64=("${pkgname}-${pkgver}-${pkgrel}-arm64.tar.gz::${url}/releases/download/${pkgver}/VSCodium-linux-arm64-${pkgver}.tar.gz")
-source_armv7h=("${pkgname}-${pkgver}-${pkgrel}-arm.tar.gz::${url}/releases/download/${pkgver}/VSCodium-linux-arm-${pkgver}.tar.gz")
+source=('vscodium-bin.desktop')
 
-case ${CARCH} in
-    x86_64) _arch=x64 ;;
-    aarch64) _arch=arm64 ;;
-    armv7h) _arch=arm ;;
-    *) _arch=unknown ;;
-esac
+sha256sums_x86_64=('e47a97b8038424cbe1f586034be7b2fb46c65fd010ef94727d7785f7831c6183')
+source_x86_64=("${pkgname}-${pkgver}.tar.gz::https://github.com/VSCodium/vscodium/releases/download/${pkgver}/${_pkgname}-linux-x64-${pkgver}.tar.gz")
 
-noextract=("${pkgname}-${pkgver}-${pkgrel}-${_arch}.tar.gz")
+sha256sums_armv7h=('6534d7b10b13a1effadf408899c90a23a8a499298d686a3e8e74535c186a6b65')
+source_armv7h=("${pkgname}-${pkgver}.tar.gz::https://github.com/VSCodium/vscodium/releases/download/${pkgver}/${_pkgname}-linux-arm-${pkgver}.tar.gz")
 
-prepare() {
-    mkdir -p ${srcdir}/${pkgname}
-    tar -xf ${srcdir}/${pkgname}-${pkgver}-${pkgrel}-${_arch}.tar.gz -C ${srcdir}/${pkgname}
-}
+sha256sums_aarch64=('e9d8a5742454ef0ea27ce8b0675a77d8d06eb16638be2aaa20972abe19b15cf3')
+source_aarch64=("${pkgname}-${pkgver}.tar.gz::https://github.com/VSCodium/vscodium/releases/download/${pkgver}/${_pkgname}-linux-arm64-${pkgver}.tar.gz")
+
+shopt -s extglob
 
 package() {
-    install -d -m755 ${pkgdir}/usr/bin
-    install -d -m755 ${pkgdir}/usr/share/{${pkgname},applications,pixmaps}
-    cp -r ${srcdir}/${pkgname} ${pkgdir}/usr/share
-    ln -s /usr/share/${pkgname}/bin/codium ${pkgdir}/usr/bin/code
-    ln -s /usr/share/${pkgname}/bin/codium ${pkgdir}/usr/bin/codium
-    ln -s /usr/share/${pkgname}/bin/codium ${pkgdir}/usr/bin/vscodium
-    install -D -m644 vscodium-bin.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
-    install -D -m644 ${srcdir}/${pkgname}/resources/app/resources/linux/code.png \
-            ${pkgdir}/usr/share/pixmaps/vscodium.png
+  install -d -m755 ${pkgdir}/usr/bin
+  install -d -m755 ${pkgdir}/usr/share/{${pkgname},applications,pixmaps}
+  cp -r ${srcdir}/!(vscodium-bin.desktop|${pkgname}-${pkgver}.tar.gz) ${pkgdir}/usr/share/${pkgname}
+  ln -s /usr/share/${pkgname}/bin/codium ${pkgdir}/usr/bin/code
+  ln -s /usr/share/${pkgname}/bin/codium ${pkgdir}/usr/bin/codium
+  ln -s /usr/share/${pkgname}/bin/codium ${pkgdir}/usr/bin/vscodium
+  install -D -m644 ${srcdir}/vscodium-bin.desktop ${pkgdir}/usr/share/applications/${_pkgname}.desktop
+  install -D -m644 ${srcdir}/resources/app/resources/linux/code.png \
+          ${pkgdir}/usr/share/pixmaps/vscodium.png
 }