diff --git a/elementary.sh b/elementary.sh index 3afb1fe..b60232c 100755 --- a/elementary.sh +++ b/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 diff --git a/namarupa.sh b/namarupa.sh deleted file mode 100755 index 59aafb3..0000000 --- a/namarupa.sh +++ /dev/null @@ -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 diff --git a/post-inst.sh b/post-inst.sh index 1e94c71..77c10ee 100755 --- a/post-inst.sh +++ b/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