chore: bump version

Signed-off-by: WithTheBraid <the-one@with-the-braid.cf>

3 files changed, 28 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db4eafb60a17..bea1952a9b55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flutter
 	pkgdesc = A new mobile app SDK to help developers and designers build modern mobile apps for iOS and Android.
-	pkgver = 3.7.12
+	pkgver = 3.10.0
 	pkgrel = 1
 	url = https://flutter.dev
 	install = flutter.install
@@ -25,10 +25,10 @@ pkgbase = flutter
 	options = !emptydirs
 	backup = opt/flutter/packages/flutter_test/pubspec.yaml
 	backup = opt/flutter/packages/flutter/pubspec.yaml
-	source = flutter-3.7.12.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.7.12-stable.tar.xz
+	source = flutter-3.10.0.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.10.0-stable.tar.xz
 	source = flutter.sh
 	source = flutter.csh
-	sha256sums = 898f7f34dcf19353060dfa33ef20e9d674c2c04dc8cc5ddae9d5ff16042dbc2e
+	sha256sums = 0d77550249a407c8099224f6a8555f21554757f6aa47a8473b3f660a4891c644
 	sha256sums = 1dea1952d386c43948b9970382c2da5b65b7870684b8ad2ad89124e873aa485a
 	sha256sums = 7ef10d753cfaac52d243549764a793f44f8284a1f4b11715ccd2fa915b026a6f
 
diff --git a/PKGBUILD b/PKGBUILD
index b83beee1c634..99a4dcee8886 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Philip Goto <philip.goto@gmail.com>, WithTheBraid <the-one@with-the-braid.cf>
 
 pkgname=flutter
-pkgver=3.7.12
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A new mobile app SDK to help developers and designers build modern mobile apps for iOS and Android."
 arch=("x86_64" "aarch64")
@@ -19,14 +19,14 @@ source=(
   "${pkgname}.sh"
   "${pkgname}.csh"
 )
-sha256sums=('898f7f34dcf19353060dfa33ef20e9d674c2c04dc8cc5ddae9d5ff16042dbc2e'
+sha256sums=('0d77550249a407c8099224f6a8555f21554757f6aa47a8473b3f660a4891c644'
             '1dea1952d386c43948b9970382c2da5b65b7870684b8ad2ad89124e873aa485a'
             '7ef10d753cfaac52d243549764a793f44f8284a1f4b11715ccd2fa915b026a6f')
 
 build() {
   rm -rf "${srcdir}/${pkgname}/bin/cache" "${srcdir}/${pkgname}/.pub-cache"
   "${srcdir}/${pkgname}/bin/internal/update_dart_sdk.sh"
-  "${srcdir}/${pkgname}/bin/flutter" precache
+  "${srcdir}/${pkgname}/bin/flutter" --no-version-check precache
 }
 
 package() {
@@ -36,9 +36,15 @@ package() {
   install -dm755 "${pkgdir}/opt/${pkgname}"
   install -dm755 "${pkgdir}/usr/bin"
   cp -ra "${srcdir}/${pkgname}" "${pkgdir}/opt/"
+
+  # version overriding, something broken; not my fault *grumble*
+  echo "${pkgver}" > "${pkgdir}/opt/${pkgname}/version" 
   find "${pkgdir}/opt/${pkgname}" -type d -exec chmod a+rx {} +
   find "${pkgdir}/opt/${pkgname}" -type f -exec chmod a+r {} +
+
   # those files *must* be read-write for end-users; not my fault *grumble*
-  chmod a+rw "${pkgdir}/opt/${pkgname}/version" "${pkgdir}/opt/${pkgname}/bin/cache/lockfile" "${pkgdir}/opt/${pkgname}/bin/cache/usbmuxd.stamp" "${pkgdir}/opt/${pkgname}/bin/cache/libimobiledevice.stamp"
+  chmod -R a+rw "${pkgdir}/opt/${pkgname}/version" "${pkgdir}/opt/${pkgname}/bin/cache" "${pkgdir}/opt/${pkgname}/.git"  
+  find "${pkgdir}/opt/${pkgname}" -name "pubspec.lock" -exec chmod a+r+ {} +
+
   ln -s "/opt/${pkgname}/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
 }
diff --git a/flutter.install b/flutter.install
index 6f7c7f3d18d5..d376bd5fa5ba 100644
--- a/flutter.install
+++ b/flutter.install
@@ -1,40 +1,21 @@
-post_install() {
-  groupadd -f flutterusers
-  chgrp -R flutterusers /opt/flutter
-  chmod -R g+w /opt/flutter
-  tput setaf 0 2>/dev/null
-  if [[ "$?" == "0" ]]; then
-    tput sgr0
-    printf "$(tput setaf 4)Flutter was installed on $(tput setaf 2)/opt/flutter$(tput sgr0)\n"
-    printf "$(tput setaf 4)$(tput sgr0)\n"
-    printf "$(tput setaf 4)In case you encounter problems using Flutter as regular user, add your user into the group flutterusers:$(tput sgr0)\n"
-    printf "$(tput setaf 2)gpasswd -a \${USER} flutterusers$(tput sgr0)\n"
-    printf "$(tput setaf 4)$(tput sgr0)\n"
-    printf "$(tput setaf 4)Re-login your terminal in to the group flutterusers:$(tput sgr0)\n"
-    printf "$(tput setaf 2)newgrp flutterusers$(tput sgr0)\n"
-    printf "$(tput setaf 4)$(tput sgr0)\n"
-    printf "$(tput setaf 4)Run the following command to see if there are any dependencies you need to install to complete the setup (for verbose output, add the -v flag):$(tput sgr0)\n"
-    printf "$(tput setaf 2)flutter doctor$(tput sgr0)\n"
-  else
-    printf "Flutter was installed on /opt/flutter\n"
-    printf "\n"
-    printf "In case you encounter problems using Flutter as regular user, add your user into the group flutterusers:\n"
-    printf "gpasswd -a \${USER} flutterusers\n"
-    printf "\n"
-    printf "Re-login your terminal in to the group flutterusers:\n"
-    printf "newgrp flutterusers\n"
-    printf "\n"
-    printf "Run the following command to see if there are any dependencies you need to install to complete the setup (for verbose output, add the -v flag):\n"
-    printf "flutter doctor\n"
+pre_upgrade() {
+  NEW=$1
+  OLD=$2
+
+  if [[ "$OLD" == "3.7"* || "$OLD" == "3.6"* ]]; then
+    echo "Cleaning up previous flutter installation."
+    rm -rf "/opt/flutter"
   fi
 }
 
 post_upgrade() {
-  post_install
-}
+  NEW=$1
+  OLD=$2
 
-post_remove() {
-  groupdel flutterusers
-  printf "$(tput setaf 4)If you had added/modified files or permissions in folder /opt/flutter is possible you need to delete it manually.$(tput sgr0)\n"
-  printf "$(tput setaf 2)rm -rf /opt/flutter$(tput sgr0)\n"
+  if [[ "$OLD" == "3.7"* || "$OLD" == "3.6"* ]]; then
+    if grep -q "flutterusers" /etc/group; then
+      echo "Removing group flutterusers as no longer needed."
+      groupdel "flutterusers"
+    fi
+  fi
 }