Commit 9ef138e5 authored by Igor Pecovnik's avatar Igor Pecovnik
Browse files

Proper desktop mini/maxi install, few typos

parent c61d71a3
...@@ -405,12 +405,24 @@ function configure_desktop () ...@@ -405,12 +405,24 @@ function configure_desktop ()
add_choose_user add_choose_user
if [ -n "$CHOSEN_USER" ]; then if [ -n "$CHOSEN_USER" ]; then
# install desktop and nodm
# update packages
debconf-apt-progress -- apt-get update debconf-apt-progress -- apt-get update
# remove desktop package to secure proper install
if check_if_installed armbian-${DISTROID}-desktop ; then
debconf-apt-progress -- apt-get -y remove armbian-${DISTROID}-desktop
fi
# install desktop package
debconf-apt-progress -- apt-get -y install $1 armbian-${DISTROID}-desktop debconf-apt-progress -- apt-get -y install $1 armbian-${DISTROID}-desktop
DEBIAN_FRONTEND=noninteractive debconf-apt-progress -- apt-get -y -qq install nodm DEBIAN_FRONTEND=noninteractive debconf-apt-progress -- apt-get -y -qq install nodm
# clean apt cache
apt-get clean
# add user to groups # add user to groups
for additionalgroup in sudo netdev audio video dialout plugdev bluetooth systemd-journal ssh; do for additionalgroup in sudo netdev audio video dialout plugdev input bluetooth systemd-journal ssh; do
usermod -aG ${additionalgroup} ${CHOSEN_USER} 2>/dev/null usermod -aG ${additionalgroup} ${CHOSEN_USER} 2>/dev/null
done done
......
...@@ -319,16 +319,16 @@ while true; do ...@@ -319,16 +319,16 @@ while true; do
else else
LIST+=( "RDP" "Enable remote desktop access from Windows" ) LIST+=( "RDP" "Enable remote desktop access from Windows" )
fi fi
if ! check_if_installed thunderbird then ; then if ! check_if_installed thunderbird ; then
LIST+=( "Thunderbird" "Install full featured email client" ) LIST+=( "Thunderbird" "Install full featured email client" )
else else
LIST+=( "Thunderbird" "Remove full featured email client" ) LIST+=( "Thunderbird" "Remove full featured email client" )
fi fi
if ! check_if_installed libreoffice-writer then ; then if ! check_if_installed libreoffice-writer ; then
LIST+=( "Writer" "Libreoffice: Writer only" ) LIST+=( "Writer" "Libreoffice: Writer only" )
LIST+=( "Suite" "Libreoffice: Full suite" ) LIST+=( "Suite" "Libreoffice: Full suite" )
else else
if ! check_if_installed libreoffice-base then ; then if ! check_if_installed libreoffice-base ; then
LIST+=( "Suite" "Libreoffice: Full suite" ) LIST+=( "Suite" "Libreoffice: Full suite" )
LIST+=( "Libre" "Remove Libre office packages" ) LIST+=( "Libre" "Remove Libre office packages" )
else else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment