From b83f5b0833a7b1bbcbc4fc04ad2b944fbdbf6d67 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Sun, 13 Jun 2021 21:57:07 +0200
Subject: [PATCH] Add GPT support, add Budgie edition and remove experimental
 from Gnome edition

Use GPT partition tables on devices that support it.
Add budgie edition to edition list, but mark it as experimental.
Remove the experimental marking on Gnome edition.

Oh, and update version to 1.4.3.

Signed-off-by: Dan Johansen <strit@manjaro.org>
---
 README.md             |  2 ++
 manjaro-arm-installer | 21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 22aa7c4..d64328f 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,8 @@ sudo bash ./manjaro-arm-installer
 * LXQT (full LXQT desktop with some qt apps)
 * Mate (full mate desktop with apps)
 * Server (minimal install with LAMP and Docker)
+* Gnome (full Gnome desktop with apps)
+* Budgie (full Budge desktop with apps) (EXPERIMENTAL)
 
 ## Other notes:
 This script is available in the **Manjaro** repository and can be installed with `sudo pacman -S manjaro-arm-installer`.
diff --git a/manjaro-arm-installer b/manjaro-arm-installer
index 5d0199f..71874e7 100755
--- a/manjaro-arm-installer
+++ b/manjaro-arm-installer
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # *****************************
-#       Version 1.4.2
+#       Version 1.4.3
 # *****************************
 
 # Set globals
@@ -271,7 +271,14 @@ prepare_card () {
 			parted -s $SDCARD rm ${v_partition} 1> /dev/null 2>&1
 		done
         #partition with boot and root
-        parted -s $SDCARD mklabel msdos 1> /dev/null 2>&1
+        case "$DEVICE" in
+            oc2|on2|on2-plus|oc4|ohc4|vim1|vim2|vim3|gtking-pro|gsking-x|edgev|pinephone)
+            parted -s $SDCARD mklabel msdos 1> /dev/null 2>&1
+            ;;
+            *)
+            parted -s $SDCARD mklabel gpt 1> /dev/null 2>&1
+            ;;
+        esac
         parted -s $SDCARD mkpart primary fat32 32M 256M 1> /dev/null 2>&1
         sleep 5
         START=`cat /sys/block/$DEV_NAME/${DEV_NAME}${SDDEV}1/start`
@@ -342,7 +349,10 @@ cleanup () {
         dd if=$TMPDIR/boot/u-boot.bin of=${SDCARD} conv=fsync bs=1 count=442 1> /dev/null 2>&1
         dd if=$TMPDIR/boot/u-boot.bin of=${SDCARD} conv=fsync bs=512 skip=1 seek=1 1> /dev/null 2>&1
         ;;
-    pinebook|pine64-lts|pine64|pinephone|pinetab|pine-h64)
+    pinebook|pine64-lts|pine64|pinetab|pine-h64)
+        dd if=$TMPDIR/boot/u-boot-sunxi-with-spl-$DEVICE.bin of=${SDCARD} conv=fsync bs=128k seek=1 1> /dev/null 2>&1
+        ;;
+    pinephone)
         dd if=$TMPDIR/boot/u-boot-sunxi-with-spl-$DEVICE.bin of=${SDCARD} conv=fsync bs=8k seek=1 1> /dev/null 2>&1
         ;;
     pbpro|rockpro64|rockpi4b|rockpi4c|nanopc-t4|rock64|roc-cc)
@@ -464,11 +474,12 @@ if [ ! -z "$DEVICE" ]; then
         "kde-plasma"    "Full KDE/Plasma Desktop    (full featured)" \
         "xfce"          "Full XFCE desktop and apps (full featured)" \
         "mate"          "Full MATE desktop and apps (lightweight)" \
+        "gnome"         "Full Gnome desktop and apps (EXPERIMANTAL)" \
+        "sway"          "Minimal Sway WM with apps  (very light)" \
         "lxqt"          "Full LXQT Desktop and apps (lightweight)" \
         "i3"            "Mininal i3 WM with apps    (very light)" \
-        "sway"          "Minimal Sway WM with apps  (very light)" \
         "server"        "Minimal with LAMP and Docker (only cli)" \
-        "gnome"         "Full Gnome desktop and apps (EXPERIMANTAL)" \
+        "budgie"        "Full Budgie desktop (EXPERIMENTAL))" \
         3>&1 1>&2 2>&3 3>&-) 
 
 else