various fixes

1 files changed, 31 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2a7df6768b14..da419242f86c 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,62 @@
+#!/bin/bash
 # Author: Justin Jagieniak <justin@jagieniak.net>
 # Contributor: Rye Mutt
 # Maintainers: Xenhat Hex (me@xenh.at), Justin Jagieniak <justin@jagieniak.net>
-
-
+# shellcheck disable=2034,3030,2154
 pkgname=alchemy-next-viewer-git
-pkgver=6.5.2.48005.c0f6ab8dca
+pkgver=6.5.2.47999.e0e1e9fb6f
 pkgrel=1
-_branch="${AL_GIT_BRANCH:=main}"
 pkgdesc="This is the next generation of Alchemy Viewer! - Git Source build"
 arch=('x86_64')
 url=https://www.alchemyviewer.org
 license=('LGPL')
 depends=(dbus-glib glu gtk3 libgl libidn libjpeg-turbo libpng libxss libxml2 mesa nss openal sdl2 vlc zlib)
-optdepends=(
-  'alsa-lib: ALSA support'
-  'freealut: OpenAL support'
-  'gamemode: Gamemode support'
-  'lib32-libidn11: SLVoice support'
-  'libpulse: PulseAudio support'
-  'mesa-libgl: Intel, Radeon, Nouveau support'
-  'nvidia-libgl: NVIDIA support'
-  'nvidia-utils: NVIDIA support')
 makedepends=('cmake' 'gcc' 'python-virtualenv' 'python-pip' 'git' 'boost' 'xz' 'ninja')
-provides=('alchemy-next' 'alchemy-viewer' 'secondlife')
-conflicts=('alchemy-next-viewer' 'alchemy-viewer')
-source=("$pkgname"::'git+https://git.alchemyviewer.org/alchemy/alchemy-next.git#branch=main' 'alchemy-next.desktop')
+optdepends=(
+    'alsa-lib: ALSA support'
+    'freealut: OpenAL support'
+    'gamemode: Gamemode support'
+    'lib32-libidn11: SLVoice support'
+    'libpulse: PulseAudio support'
+    'mesa-libgl: Intel, Radeon, Nouveau support'
+    'nvidia-libgl: NVIDIA support'
+'nvidia-utils: NVIDIA support')
+provides=('alchemy-next' 'secondlife')
+conflicts=('alchemy-next-viewer-git')
+replaces=('alchemy-next-viewer' 'alchemy-next-viewer-git')
+options=(!emptydirs !makeflags !strip !lto)
+source=("${pkgname}"::'git+https://git.alchemyviewer.org/alchemy/alchemy-next.git#branch=main' 'alchemy-next.desktop')
 md5sums=('SKIP'
          '59114df2d7f081aad499ad5b7d8401b7')
 sha256sums=('SKIP'
             '28f928d7620818db47e7903722173a49daf36973ae51091e9ab9845211448864')
 b2sums=('SKIP'
         'da5639043f1854d9d2dc884fd62a4239fdc7ca2467cd95cfcb7f6bc73ac93e73cc0229e16000378efa22d646e3756a9495d2d8bb8c76049f77e4731c2a997729')
+
 pkgver() {
-    cd "${pkgname}"
+    cd "${pkgname}" || exit 1
     ( set -o pipefail
         git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
         printf "%s.%s.%s" "$(cat indra/newview/VIEWER_VERSION.txt)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
     )
 }
+
 prepare() {
-    cd "$pkgname" || exit 1
+    cd "${pkgname}" || exit 1
     git fetch --prune
     git checkout main
     git pull --autostash
-    git checkout "origin/${_branch}"
+    git checkout "${AL_GIT_BRANCH:-e0e1e9fb6f}"
 }
+
 build() {
-    cd "$pkgname" || exit 1
+    cd "${pkgname}" || exit 1
     virtualenv ".venv" -p python3
     source ".venv/bin/activate"
     if command -v autobuild; then
         abver="$(autobuild --version)"
-        echo "Found $abver"
-        if [[ "${abver}" == "autobuild 2.1.0" ]]; then
+        echo "Found ${abver}"
+        if [ "${abver}" = "autobuild 2.1.0" ]; then
             echo "Reinstalling autobuild to work around some bugs"
             pip3 uninstall --yes autobuild
         fi
@@ -65,9 +69,10 @@ build() {
     cd "build-linux-64"
     ninja -j"$(nproc)"
 }
+
 package() {
-    mkdir -p "$pkgdir/opt"
-    mkdir -p "$pkgdir/usr/share/applications"
-    mv "${pkgname}/build-linux-64/newview/packaged" "$pkgdir/opt/alchemy-next-viewer"
-    install -Dm644 "alchemy-next.desktop" "$pkgdir/usr/share/applications/alchemy-next.desktop"
+    mkdir -p "${pkgdir}/opt"
+    mkdir -p "${pkgdir}/usr/local/share/applications"
+    mv "${pkgname}/build-linux-64/newview/packaged" "${pkgdir}/opt/${pkgname}"
+    install -Dm644 "alchemy-next.desktop" "${pkgdir}/usr/share/applications/alchemy-viewer-git.desktop"
 }