From 7ce0f5eeed0b1bda4d38bd764c7d85dec3ca4229 Mon Sep 17 00:00:00 2001
From: xiota <aur@mentalfossa.com>
Date: Sat, 6 Jul 2024 16:14:11 +0000
Subject: [PATCH] 3.22.2-2: adjust install script

---
 .SRCINFO        |  2 +-
 PKGBUILD        |  4 ++--
 flutter.install | 16 +++++++---------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 4a037f6a8a790..3843a8f97f4ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = flutter-bin
 	pkgdesc = Cross platform widget toolkit for Dart (monolithic)
 	pkgver = 3.22.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/flutter/flutter
 	install = flutter.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 8e2be02f5f42b..a46835e6079f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname="flutter"
 pkgname="$_pkgname-bin"
 pkgver=3.22.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross platform widget toolkit for Dart (monolithic)"
 arch=("x86_64")
 url="https://github.com/flutter/flutter"
@@ -146,7 +146,7 @@ _unionfs() {
   fi
 }
 
-if whoami | grep -q -E 'builduser|main-builder'; then
+if whoami | grep -q -E 'builder|builduser|main-builder'; then
   export FLUTTER_ROOT="$APP_DIR"
 elif grep -q flutter <<< $(groups); then
   export FLUTTER_ROOT="$APP_DIR"
diff --git a/flutter.install b/flutter.install
index 829e2c21a29d1..2d6c7552f9e55 100644
--- a/flutter.install
+++ b/flutter.install
@@ -28,6 +28,8 @@ post_install() {
 
   echo "Users may be added to the 'flutter' group:"
   echo "   sudo usermod -a -G flutter [username]"
+  echo
+  echo "Warning: Do not store important data in '/opt/flutter'"
 }
 
 post_upgrade() {
@@ -35,11 +37,11 @@ post_upgrade() {
 }
 
 pre_install() {
-  chmod -R go-w opt/flutter
+  chmod -R u+rwX,go+rX,go-w opt/flutter
 }
 
 pre_upgrade() {
-  chmod -R go-w opt/flutter
+  chmod -R u+rwX,go+rX,go-w opt/flutter
 }
 
 pre_remove() {
@@ -53,16 +55,12 @@ pre_remove() {
     fi
   done
 
-  chmod -R go-w opt/flutter
+  chmod -R u+rwX,go+rX,go-w opt/flutter
 }
 
 post_remove() {
-  # leave opt directory to prevent data loss
-  echo "The 'flutter' directory may be removed, if not needed:"
-  echo "   sudo \rm -rf /opt/flutter"
-  echo
+  rm -rf opt/flutter
 
-  # leave group to prevent orphan permissions
-  echo "The 'flutter' group may also be removed:"
+  echo "If no longer needed, remove the 'flutter' group:"
   echo "   sudo groupdel flutter"
 }