From 153860c744a3316a43dd10531b0ca3445eaaee04 Mon Sep 17 00:00:00 2001
From: Botspot <54716352+Botspot@users.noreply.github.com>
Date: Fri, 14 Jul 2023 12:22:55 -0500
Subject: [PATCH] Snap Store: first remove Add/Remove Software to fix conflict

---
 apps/Snap Store/install | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/Snap Store/install b/apps/Snap Store/install
index a8064d277e..78a258b74d 100755
--- a/apps/Snap Store/install	
+++ b/apps/Snap Store/install	
@@ -1,5 +1,13 @@
 #!/bin/bash
 # Get dependencies
+if package_installed pi-package ;then #pi-package-data conflicts with gnome-packagekit-data - see https://github.com/raspberrypi-ui/pipackage/issues/7
+  yad --class Pi-Apps --name "Pi Apps" --center --window-icon="${DIRECTORY}/icons/logo.png" --title="Pi-Apps" --image=system-software-install \
+  --text="Snap Store now cannot be installed along with the <b>Add / Remove Software</b> program."$'\n'"Do you wish to remove it now, or cancel installation?" \
+  --button="Remove <u>Add / Remove Software</u>":0 --button="Cancel installation of Snap Store":1 || error "User error: exited"
+  apt_lock_wait
+  sudo apt purge -y pi-package pi-package-data pi-package-session --autoremove || error "APT failed to remove the "\""Add / Remove Software"\"" program"
+fi
+
 install_packages libsquashfuse0 squashfuse fuse libgconf-2-4 || exit 1
 sudo apt install -y snapd || error "APT failed to install snapd"