From 3dc9a0f4fd291f92cc56428939f23761bb921ff7 Mon Sep 17 00:00:00 2001
From: xiota <aur@mentalfossa.com>
Date: Wed, 4 Sep 2024 18:34:31 +0000
Subject: [PATCH] 3.24.2

---
 .SRCINFO        |  8 ++++----
 .nvchecker.toml |  3 +++
 PKGBUILD        | 39 ++++++++++++++++++++++++++-------------
 flutter.install |  9 +++++----
 4 files changed, 38 insertions(+), 21 deletions(-)
 create mode 100644 .nvchecker.toml

diff --git a/.SRCINFO b/.SRCINFO
index ea26752576095..eedc25683feb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flutter-bin
 	pkgdesc = Cross platform widget toolkit for Dart (monolithic)
-	pkgver = 3.24.1
+	pkgver = 3.24.2
 	pkgrel = 1
 	url = https://github.com/flutter/flutter
 	install = flutter.install
@@ -39,12 +39,12 @@ pkgbase = flutter-bin
 	conflicts = flutter-material-fonts
 	conflicts = flutter-sky-engine
 	conflicts = flutter-tool-developer
-	noextract = flutter-3.24.1.tar.xz
+	noextract = flutter-3.24.2.tar.xz
 	options = !emptydirs
 	options = !strip
 	options = !debug
-	source = flutter-3.24.1.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.24.1-stable.tar.xz
-	sha256sums = 32daf9d5a8e430f57fb139921400c7ecf34e4e7e404818ac55658a5a0eaa28f0
+	source = flutter-3.24.2.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.24.2-stable.tar.xz
+	sha256sums = 143f77340401e7f147a380ba18112445ed017c1d187fb4d20e40bb6ea1f13aa5
 
 pkgname = flutter-bin
 	depends = clang
diff --git a/.nvchecker.toml b/.nvchecker.toml
new file mode 100644
index 0000000000000..023b2694aa656
--- /dev/null
+++ b/.nvchecker.toml
@@ -0,0 +1,3 @@
+[flutter-bin]
+source = "git"
+git = "https://github.com/flutter/flutter.git"
diff --git a/PKGBUILD b/PKGBUILD
index 73c2ea22a97fd..b9a8e24feaf0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname="flutter"
 pkgname="$_pkgname-bin"
-pkgver=3.24.1
+pkgver=3.24.2
 pkgrel=1
 pkgdesc="Cross platform widget toolkit for Dart (monolithic)"
 arch=("x86_64")
@@ -61,7 +61,7 @@ source=(
 )
 
 sha256sums=(
-  '32daf9d5a8e430f57fb139921400c7ecf34e4e7e404818ac55658a5a0eaa28f0'
+  '143f77340401e7f147a380ba18112445ed017c1d187fb4d20e40bb6ea1f13aa5'
 )
 
 prepare() {
@@ -81,17 +81,30 @@ package() {
     unionfs-fuse
   )
 
+  # main files
   install -dm755 "$pkgdir/opt"
   bsdtar -xf "$srcdir/$_pkgsrc.$_pkgext" -C "$pkgdir/opt"
 
-  install -Dm755 "flutter.sh" "$pkgdir/usr/bin/flutter"
-  install -Dm755 "flutter_dart.sh" "$pkgdir/usr/bin/dart"
-  install -Dm644 "flutter_init.sh" "$pkgdir/opt/flutter/flutter_init.sh"
+  # scripts
+  install -Dm755 "flutter.sh" "$pkgdir/opt/flutter/bin/aur_flutter"
+  install -Dm755 "flutter_dart.sh" "$pkgdir/opt/flutter/bin/aur_dart"
+  install -Dm644 "flutter_init.sh" "$pkgdir/opt/flutter/bin/aur_init.sh"
+
+  # symlinks
+  install -dm755 "$pkgdir/usr/bin"
+  ln -sf "/opt/flutter/bin/aur_flutter" "$pkgdir/usr/bin/flutter"
+  ln -sf "/opt/flutter/bin/aur_dart" "$pkgdir/usr/bin/dart"
+
+  # gitignore
+  echo "dart_aur" >> "$pkgdir/opt/flutter/.git/info/exclude"
+  echo "flutter_aur" >> "$pkgdir/opt/flutter/.git/info/exclude"
   echo "flutter_init.sh" >> "$pkgdir/opt/flutter/.git/info/exclude"
 
+  # license
   install -Dm644 "$pkgdir/opt/flutter/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
   install -Dm644 "$pkgdir/opt/flutter/PATENT_GRANT" -t "$pkgdir/usr/share/licenses/$pkgname/"
 
+  # permissions
   chmod -R u+rwX,go+rX,go-w "$pkgdir"
 }
 
@@ -99,7 +112,7 @@ _gen_scripts() {
   cat > flutter_dart.sh << 'END'
 #!/usr/bin/env bash
 
-source /opt/flutter/flutter_init.sh
+source /opt/flutter/bin/aur_init.sh
 
 if ! grep -q '/usr/bin' <<< "$(which dart)"; then
   exec dart "$@"
@@ -109,7 +122,7 @@ END
   cat > flutter.sh << 'END'
 #!/usr/bin/env bash
 
-source /opt/flutter/flutter_init.sh
+source /opt/flutter/bin/aur_init.sh
 
 if ! grep -q '/usr/bin' <<< "$(which flutter)"; then
   exec flutter "$@"
@@ -117,7 +130,12 @@ fi
 END
 
   cat > flutter_init.sh << 'END'
-# do not execute this script directly
+#!/usr/bin/env -S bash -c "echo 'Do no run this script directly.'"
+
+if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
+  echo "$0 should not be executed directly."
+  exit 1
+fi
 
 export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
 
@@ -125,11 +143,6 @@ APP_DIR="/opt/flutter"
 SAVE_DIR="$XDG_CACHE_HOME/flutter_local"
 MOUNT_DIR="$XDG_CACHE_HOME/flutter_sdk"
 
-if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
-  echo "$0 should not be executed directly."
-  exit 1
-fi
-
 if [ ! -e "$APP_DIR" ]; then
   echo "/opt/flutter not found."
   return 1
diff --git a/flutter.install b/flutter.install
index f2c9b6ee661ec..94ec7b6e240e5 100644
--- a/flutter.install
+++ b/flutter.install
@@ -49,7 +49,9 @@ post_install() {
     fi
   done
 
-  msg1 "Flutter requires write permission to its install directory."
+  note 'Warning:' "'/opt/flutter' will be wiped on upgrade and uninstall."
+  echo
+  msg2 "Flutter requires write permission to the install directory."
   echo
   msg2 "This package redirects writes to '~/.cache/flutter_*'."
   msg2 "Users should unmount and clear the cache after upgrades."
@@ -57,11 +59,10 @@ post_install() {
   msg2 "        fusermount -uq ~/.cache/flutter_sdk"
   msg2 "        rm -rf ~/.cache/{flutter_sdk,flutter_local}"
   echo
-  msg2 "Optionally, users may be added to the 'flutter' group:"
+  msg2 "Optionally, adding users to the 'flutter' group would"
+  msg2 "give them direct access to '/opt/flutter':"
   echo
   msg2 "        sudo usermod -a -G flutter [username]"
-  echo
-  note 'Warning:' "'/opt/flutter' will be wiped on upgrade and uninstall."
 }
 
 post_upgrade() {