From 08b9ef2059f72fc59648007c51b3976c3234299d Mon Sep 17 00:00:00 2001
From: xiota <aur@mentalfossa.com>
Date: Thu, 22 Aug 2024 11:59:47 +0000
Subject: [PATCH] 3.24.1

---
 .SRCINFO        |  8 ++++----
 PKGBUILD        | 15 ++++++++-------
 flutter.install |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 0c3a2392f8f6f..ea26752576095 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flutter-bin
 	pkgdesc = Cross platform widget toolkit for Dart (monolithic)
-	pkgver = 3.24.0
+	pkgver = 3.24.1
 	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.0.tar.xz
+	noextract = flutter-3.24.1.tar.xz
 	options = !emptydirs
 	options = !strip
 	options = !debug
-	source = flutter-3.24.0.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.24.0-stable.tar.xz
-	sha256sums = d52a5d12f17d8bcf868d1ccc01fe0f7ffb05b53d9628aa21b07a18f9d33621f2
+	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
 
 pkgname = flutter-bin
 	depends = clang
diff --git a/PKGBUILD b/PKGBUILD
index e03d8a7ceca94..73c2ea22a97fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname="flutter"
 pkgname="$_pkgname-bin"
-pkgver=3.24.0
+pkgver=3.24.1
 pkgrel=1
 pkgdesc="Cross platform widget toolkit for Dart (monolithic)"
 arch=("x86_64")
@@ -61,7 +61,7 @@ source=(
 )
 
 sha256sums=(
-  'd52a5d12f17d8bcf868d1ccc01fe0f7ffb05b53d9628aa21b07a18f9d33621f2'
+  '32daf9d5a8e430f57fb139921400c7ecf34e4e7e404818ac55658a5a0eaa28f0'
 )
 
 prepare() {
@@ -84,9 +84,10 @@ package() {
   install -dm755 "$pkgdir/opt"
   bsdtar -xf "$srcdir/$_pkgsrc.$_pkgext" -C "$pkgdir/opt"
 
-  install -Dm755 "flutter_init.sh" "$pkgdir/usr/bin/flutter_init"
-  install -Dm755 "flutter_dart.sh" "$pkgdir/usr/bin/dart"
   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"
+  echo "flutter_init.sh" >> "$pkgdir/opt/flutter/.git/info/exclude"
 
   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/"
@@ -98,7 +99,7 @@ _gen_scripts() {
   cat > flutter_dart.sh << 'END'
 #!/usr/bin/env bash
 
-source /usr/bin/flutter_init
+source /opt/flutter/flutter_init.sh
 
 if ! grep -q '/usr/bin' <<< "$(which dart)"; then
   exec dart "$@"
@@ -108,7 +109,7 @@ END
   cat > flutter.sh << 'END'
 #!/usr/bin/env bash
 
-source /usr/bin/flutter_init
+source /opt/flutter/flutter_init.sh
 
 if ! grep -q '/usr/bin' <<< "$(which flutter)"; then
   exec flutter "$@"
@@ -116,7 +117,7 @@ fi
 END
 
   cat > flutter_init.sh << 'END'
-#!/usr/bin/env bash
+# do not execute this script directly
 
 export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
 
diff --git a/flutter.install b/flutter.install
index e2ec20439b447..f2c9b6ee661ec 100644
--- a/flutter.install
+++ b/flutter.install
@@ -49,15 +49,15 @@ post_install() {
     fi
   done
 
-  msg1 "Flutter requires write permission into its install directory."
+  msg1 "Flutter requires write permission to its install directory."
+  echo
   msg2 "This package redirects writes to '~/.cache/flutter_*'."
   msg2 "Users should unmount and clear the cache after upgrades."
   echo
   msg2 "        fusermount -uq ~/.cache/flutter_sdk"
   msg2 "        rm -rf ~/.cache/{flutter_sdk,flutter_local}"
   echo
-  msg1 "Optionally, users may be given write permission to '/opt/flutter'"
-  msg2 "by adding them to the 'flutter' group:"
+  msg2 "Optionally, users may be added to the 'flutter' group:"
   echo
   msg2 "        sudo usermod -a -G flutter [username]"
   echo