Missing apps installed and 'gnome-software' and 'snapd' removed to bring custom installation in line with default

elementary.sh

@@ -17,6 +17,7 @@ curl \
 dosfstools \
 dpkg-dev \
 efibootmgr \
+elementary-desktop \
 ethtool \
 flatpak \
 keyboard-configuration \
@@ -117,4 +118,37 @@ elif [[ "${1}" == '--network' ]]; then
 
 	touch \
 		/etc/NetworkManager/conf.d/10-globally-managed-devices.conf
+elif [[ "${1}" == '--apps' ]]; then
+	app=(\
+io.elementary.calculator \
+io.elementary.camera \
+io.elementary.capnet-assist \
+io.elementary.maps \
+io.elementary.music \
+io.elementary.screenshot \
+io.elementary.videos \
+org.gnome.Epiphany \
+org.gnome.Evince \
+org.gnome.FileRoller \
+org.gnome.font-viewer\
+)
+
+	apps="app/${app[0]}"
+
+	for ((i=1;i<${#app[@]};i++)); do
+		apps+=" app/${app[${i}]}"
+	done
+
+	flatpak \
+		install \
+		appcenter \
+		-y \
+		${apps}
+elif [[ "${1}" == '--purge' ]]; then
+	apt \
+		purge \
+		--yes \
+		--autoremove \
+		gnome-software \
+		snapd
 fi

install.sh

@@ -124,6 +124,12 @@ if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
 	"${baseDir}/debian.sh" --purge-os-prober
 fi
 
+if [[ "${ID}" == 'elementary' ]]; then
+	"${baseDir}/elementary.sh" --purge
+
+	"${baseDir}/elementary.sh" --apps
+fi
+
 printf \
 	'\033[?47h\033[2J\033[H'
 

post-inst.sh

@@ -135,13 +135,7 @@ if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
 		--yes
 fi
 
-if [[ "${ID}" == 'elementary' ]]; then
-	apt \
-		install \
-		--yes \
-		--autoremove \
-		elementary-desktop
-elif [[ "${ID}" = 'debian' ]]; then
+if [[ "${ID}" = 'debian' ]]; then
 	"${baseDir}/debian.sh" --tasksel
 fi