Moved installing 'wingpanel-indicator-namarupa' into 'elementary.sh'

elementary.sh

@@ -153,4 +153,31 @@ elif [[ "${1}" == '--desktop' ]]; then
 		install \
 		--yes \
 		elementary-desktop
+elif [[ "${1}" == '--namarupa' ]]; then
+	curl \
+		--progress \
+		--location \
+		--remote-name \
+		--continue-at - \
+		--output-dir '/tmp' \
+		'https://github.com/lenemter/wingpanel-indicator-namarupa/raw/main/com.github.lenemter.wingpanel-indicator-namarupa.deb'
+
+	apt \
+		--update \
+		install \
+		--yes \
+		'/tmp/com.github.lenemter.wingpanel-indicator-namarupa.deb'
+
+	mkdir \
+		-p \
+		/home/${username}/.config/autostart
+
+	cp \
+		/etc/xdg/autostart/indicator-application.desktop \
+		/home/${username}/.config/autostart/
+
+	sed \
+		-i \
+		's/^OnlyShowIn.*/OnlyShowIn=Unity;GNOME;Pantheon;/' \
+		/home/${username}/.config/autostart/indicator-application.desktop
 fi

namarupa.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-baseDir="$(realpath "$(dirname "${0}")")"
-
-source \
-	/etc/os-release
-source \
-	"${baseDir}/system.conf"
-
-
-curl \
-	--progress \
-	--location \
-	--remote-name \
-	--continue-at - \
-	--output-dir '/tmp' \
-	'https://github.com/lenemter/wingpanel-indicator-namarupa/raw/main/com.github.lenemter.wingpanel-indicator-namarupa.deb'
-
-apt \
-	--update \
-	install \
-	--yes \
-	'/tmp/com.github.lenemter.wingpanel-indicator-namarupa.deb'
-
-mkdir \
-	-p \
-	/home/${username}/.config/autostart
-
-cp \
-	/etc/xdg/autostart/indicator-application.desktop \
-	/home/${username}/.config/autostart/
-
-sed \
-	-i \
-	's/^OnlyShowIn.*/OnlyShowIn=Unity;GNOME;Pantheon;/' \
-	/home/${username}/.config/autostart/indicator-application.desktop

post-inst.sh

@@ -76,7 +76,7 @@ source \
 "${baseDir}/adduser.sh"
 
 if [[ "${ID}" == 'elementary' ]]; then
-	"${baseDir}/namarupa.sh"
+	"${baseDir}/elementary.sh" --namarupa
 elif [[ "${ID}" == 'debian' ]]; then
 	"${baseDir}/debian.sh" --contrib
 fi