Align packaging with flutter

2 files changed, 25 insertions, 27 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f2530872b362..99e017b59ef4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=flutter-beta
 pkgver=3.15.0_15.1.pre
-pkgrel=1
+pkgrel=2
 pkgdesc="A new mobile app SDK to help developers and designers build modern mobile apps for iOS and Android."
 arch=("x86_64")
 url="https://${pkgname%-beta}.io"
@@ -25,20 +25,34 @@ sha256sums=('6fc2503bc70b69d7d063dc27216c0d24da5b31886ff9654a9fa0d28bc50190f8'
             '7ef10d753cfaac52d243549764a793f44f8284a1f4b11715ccd2fa915b026a6f')
 
 build() {
-  cd "${srcdir}/${pkgname%-beta}"
-  "${srcdir}/${pkgname%-beta}/bin/${pkgname%-beta}" doctor
+  rm -rf "${srcdir}/${pkgname%-beta}/bin/cache" "${srcdir}/${pkgname%-beta}/.pub-cache"
+  "${srcdir}/${pkgname%-beta}/bin/internal/update_dart_sdk.sh"
+  "${srcdir}/${pkgname%-beta}/bin/flutter" --no-version-check precache
 }
 
 package() {
-  rm -rf "${srcdir}/${pkgname%-beta}/bin/cache" "${srcdir}/${pkgname%-beta}/.pub-cache"
   install -Dm644 "${srcdir}/${pkgname%-beta}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -Dm755 "${srcdir}/${pkgname%-beta}.sh" "${pkgdir}/etc/profile.d/${pkgname%-beta}.sh"
   install -Dm755 "${srcdir}/${pkgname%-beta}.csh" "${pkgdir}/etc/profile.d/${pkgname%-beta}.csh"
   install -dm755 "${pkgdir}/opt/${pkgname%-beta}"
   install -dm755 "${pkgdir}/usr/bin"
   cp -ra "${srcdir}/${pkgname%-beta}" "${pkgdir}/opt/"
+
+  # Version override
+  echo "${pkgver}" > "${pkgdir}/opt/${pkgname%-beta}/version" 
+
+  # Addition of read rights for end-users
   find "${pkgdir}/opt/${pkgname%-beta}" -type d -exec chmod a+rx {} +
   find "${pkgdir}/opt/${pkgname%-beta}" -type f -exec chmod a+r {} +
-  chmod a+rw "${pkgdir}/opt/${pkgname%-beta}/version"
+
+  # Addition of read/write rights for end-users
+  chmod a+rw "${pkgdir}/opt/${pkgname%-beta}" "${pkgdir}/opt/${pkgname%-beta}/.pub-preload-cache"
+  chmod -R a+rw "${pkgdir}/opt/${pkgname%-beta}/version" "${pkgdir}/opt/${pkgname%-beta}/bin/cache" "${pkgdir}/opt/${pkgname%-beta}/.git"
+  find "${pkgdir}/opt/${pkgname%-beta}" -name "pubspec.lock" -exec chmod a+rw {} +
+  find "${pkgdir}/opt/${pkgname%-beta}" -name "package_config.json" -exec chmod a+rw {} +
+
+  # fix git ref migrations
+  mv "${pkgdir}/opt/${pkgname%-beta}/.git" "${pkgdir}/opt/${pkgname%-beta}/.git-refs"
+
   ln -s "/opt/${pkgname%-beta}/bin/${pkgname%-beta}" "${pkgdir}/usr/bin/${pkgname%-beta}"
-}
+}
\ No newline at end of file
diff --git a/flutter.install b/flutter.install
index 6f1a94301ad8..a96d2677cb50 100644
--- a/flutter.install
+++ b/flutter.install
@@ -1,27 +1,11 @@
+pre_upgrade() {
+  rm -rf "/opt/flutter/.git"
+}
+
 post_install() {
-  groupadd -f flutterusers
-  chgrp -R flutterusers /opt/flutter
-  chmod -R g+w /opt/flutter
-  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)If you intend to use it as a 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)You need to source $(tput setaf 2)/etc/profile$(tput setaf 4) or relogin to add flutter to your path.$(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)To run flutter doctor correctly:$(tput sgr0)\n"
-  printf "$(tput setaf 2)git config --global --add safe.directory /opt/flutter$(tput sgr0)\n"
+  mv "/opt/flutter/.git-refs" "/opt/flutter/.git"
 }
 
 post_upgrade() {
   post_install
 }
-
-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"
-}