Major rewrite of build() and package() for increased readability and easier maintenance of the PKGBUILD.

1 files changed, 11 insertions, 9 deletions

diff --git a/grub-git.install b/grub-git.install
index cf2e4b59535f..c13ef99c77c5 100644
--- a/grub-git.install
+++ b/grub-git.install
@@ -1,15 +1,17 @@
-post_install() {
-  if [ -f /boot/grub/grub.cfg.pacsave ]; then
-    echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
-    install -D -m0644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
+#!/bin/sh
+
+post_upgrade() {
+  # We used to package /boot/grub/grub.cfg, but there is no reason to.
+  # Remove the file from package, but move real file back in place.
+  if [ ! -f /boot/grub/grub.cfg -a -f /boot/grub/grub.cfg.pacsave ]; then
+    mv /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
   fi
+}
 
+post_install() {
   cat << 'EOM'
-Generating grub.cfg.example config file...
-This may fail on some machines running a custom kernel.
+Generate your bootloader configuration with:
+  grub-mkconfig -o /boot/grub/grub.cfg
 EOM
-
-  grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
-  echo "done."
 }