add LICENSE

add fonts-noto-color-emoji  , remove brasero (leftover from my personal stuff, now in branch 'deltalima')

LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2024 DeltaLima
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,17 +1,23 @@
-Origin: https://git.la10cy.net/DeltaLima/Desktop-DeltaLima
+# make-debian-look-like-ubuntu
 
-**branch deltalima** 
+Origin: https://git.la10cy.net/DeltaLima/make-debian-look-like-ubuntu
 
-this branch is for my personal system setups. feel free to use it as well, but there are customizations that fit really only my own taste. so best have a look into include/packages.inc.sh!
+This script performs all necessary steps to make a Debian 12 (bookworm) Gnome desktop look like an Ubuntu desktop.
+Also it installs flatpak with flathub.org repository enabled and Firefox from there.
 
-Script for setting up a Debian Gnome Desktop System, I like. Make the system appeareance more "ubuntuish" for the executing user. With firefox flatpak as default browser for the user.
+The settings are only applied to the user which is executing this script. The user has to be in the `sudo` group. If not, the script will advise you how to do so.
 
-After the first run of setup.sh, you have to reboot and re-run the script.
+**Important!** After the first run of setup.sh, you have to reboot and re-run the script. 
+When the script runs the first time, it is normal that the terminal font looks ugly after it. It's normal after a reboot.
+
+## Installation
+
+Just execute setup.sh and show will start:
 
 ```bash
-$ bash setup.sh
+$ bash make-debian-look-like-ubuntu.sh
 ```
 
-You can customize standard packages, which got installed. Just edit the Array in `include/packages.inc.sh`
+You can customize standard packages, which gets installed. Just add an entry to the array defined in `include/packages.inc.sh`
 
-![Ubuntuish Debian 12 Gnome Desktop](/screenshot/screenshot1.png "Ubuntuish Debian 12 Gnome Desktop")
+![Ubuntuish Debian 12 Gnome Desktop](screenshot/screenshot1.png "Ubuntuish Debian 12 Gnome Desktop")

include/packages.inc.sh

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-declare -A packages
-
-# the first three array entries are numbered because they have to be ordered
-
-# install base desktop stuff
-packages[0-base]="linux-headers-amd64 plymouth build-essential
-p7zip-full unrar unzip  neofetch ecryptfs-utils curl wget python-is-python3" 
-
-# install desktop base
-packages[1-desktop-base]="ttf-mscorefonts-installer fonts-ubuntu fonts-ubuntu-console fonts-liberation2
-fonts-noto-core fonts-noto-mono fonts-noto-extra fonts-noto-ui-core fonts-noto-color-emoji fonts-dejavu
-fonts-hack flatpak flatpak-xdg-utils gnome-software-plugin-flatpak network-manager-openvpn-gnome brasero
-dconf-editor thunderbird"
-
-# install gnome base
-packages[2-desktop-gnome]="gnome-shell-extension-manager gnome-tweaks gnome-shell-extensions 
-gnome-shell-extension-desktop-icons-ng gnome-shell-extension-dashtodock
-gnome-shell-extension-appindicator gnome-shell-extension-system-monitor 
-gnome-shell-extension-panel-osd 
-yaru-theme-gnome-shell yaru-theme-gtk yaru-theme-icon yaru-theme-sound
-yaru-theme-unity"
-
-# install admin and dev tools
-packages[admin]="htop iotop sysstat lm-sensors git mc vim btop btrfs-progs 
-debootstrap geany geany-plugins lnav mtr-tiny ncdu nmap ppp borgbackup borgmatic
-pandoc pwgen remmina rsync screen socat stress strace tcpdump ufw colordiff
-ifstat"
-
-# install nice programs
-packages[nice]="wine:i386 winetricks chromium dosbox gimp vlc barrier audacity
-keepassxc audacious clementine nextcloud-desktop qv4l2 guvcview
-shutter solaar steam-installer"
-
-# you can just add your own packages like shown above and below, just add
-# a new array field :)
-
-# install games 
-#packages[game]="openarena"
-
-# ham radio
-#packages[ham]="direwolf gqrx-sdr ax25-tools ax25-apps js8call"
-
-# lol stuff :)
-#packages[lol]="lolcat"
-
-# packages for xubuntuish XFCE
-#packages[desktop-xfce]="gnome-keyring seahorse python3-keyring mugshot elementary-xfce-icon-theme 
-#lightdm-settings lightdm-gtk-greeter-settings gvfs-backends mate-calc"

make-debian-look-like-ubuntu.sh

@@ -1,9 +1,64 @@
 #!/bin/bash
 
+# Title: make-debian-look-like-ubuntu.sh
+# Description: This script performs all necessary steps to make a Debian Gnome
+# desktop look like an Ubuntu desktop. Also it installs flatpak with 
+# flathub.org repository enabled and Firefox from there.
+# Author: DeltaLima
+# Date: 21.06.2023
+# Version: 1.0
+# Usage: bash make-debian-look-like-ubuntu.sh
+# 
+# Copyright 2023 DeltaLima (Marcus Hanisch)
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy 
+# of this software and associated documentation files (the “Software”), to deal
+# in the Software without restriction, including without limitation the rights 
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+# copies of the Software, and to permit persons to whom the Software is 
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in 
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# 
+#
+
 arguments="$@"
 
-# get the $packages Array
-. include/packages.inc.sh
+# define the $packages[] array
+declare -A packages
+
+# the first three array entries are numbered because they have to be ordered
+
+# install base desktop stuff
+packages[0-base]="plymouth ecryptfs-utils curl wget python-is-python3 binutils" 
+
+# install desktop base
+packages[1-desktop-base]="ttf-mscorefonts-installer fonts-ubuntu fonts-ubuntu-console fonts-liberation2
+fonts-noto-core fonts-noto-color-emoji fonts-dejavu fonts-hack
+flatpak flatpak-xdg-utils gnome-software-plugin-flatpak network-manager-openvpn-gnome
+dconf-editor thunderbird"
+
+# install gnome base
+packages[2-desktop-gnome]="gnome-shell-extension-manager gnome-tweaks gnome-shell-extensions 
+gnome-shell-extension-desktop-icons-ng gnome-shell-extension-dashtodock
+gnome-shell-extension-appindicator gnome-shell-extension-system-monitor 
+gnome-shell-extension-panel-osd 
+yaru-theme-gnome-shell yaru-theme-gtk yaru-theme-icon yaru-theme-sound
+yaru-theme-unity
+gnome-package-updater gnome-packagekit"
+
+# if you want to add for automation purposes your own packages, just add another array field, like
+#packages[4-my-packages]="shutter solaar steam-installer chromium dosbox gimp vlc audacity keepassxc audacious nextcloud-desktop"
+
 
 # colors for colored output 8)
 RED="\e[31m"
@@ -42,9 +97,9 @@ error ()
 
 confirm_continue()
 {
-  message warn "Type '${GREEN}yes${ENDCOLOR}' and hit [ENTER] to continue"
-  read -p "=> " continue
-  if [ "$continue" != "yes" ] 
+  message warn "Type '${GREEN}y${ENDCOLOR}' or '${GREEN}yes${ENDCOLOR}' and hit [ENTER] to continue"
+  read -p "[y/N?] " continue
+  if [ "${continue,,}" != "y" ] && [ "${continue,,}" != "yes" ]
   then
     message error "Installation aborted."
     exit 1
@@ -67,14 +122,24 @@ fi
 
 # sort the category list, some of them have to be in order
 package_categories="$(echo $package_categories | xargs -n1 | sort | xargs)"
-
-message "This script makes a fresh Debian-Gnome installation more 'ubuntuish'"
-message "look'n'feel for the current running user ($USER)."
+message "Welcome to ${GREEN}make-debian-look-like-ubuntu${ENDCOLOR}!"
 message ""
-message "Do you want to install these package categories?"
+message "This script makes a fresh Debian-Gnome installation to look like"
+message "an Ubuntu Gnome installation. Settings are applied for the user"
+message "running this script (${YELLOW}${USER}${ENDCOLOR})".
+message ""
+message "Your user has to be in the 'sudo' group."
+message "If not, the script will guide you."
+message ""
+message "The process is divided into following steps:"
 message "${YELLOW}$package_categories${ENDCOLOR}"
-message "You can also specify only a few to install, e.g. '${YELLOW}0-base admin${ENDCOLOR}':"
-message " ${YELLOW}bash $0 0-base 1-desktop-base 2-desktop-gnome${ENDCOLOR}"
+message ""
+message "If you want, you can run only a few of them, e.g. just '${YELLOW}2-desktop-gnome${ENDCOLOR}':"
+message " ${YELLOW}bash $0 2-desktop-gnome${ENDCOLOR}"
+message ""
+message warn "Some files, like gtk settings, get overwritten without asking."
+message warn "If this is not a fresh installation, make a backup first!"
+message ""
 confirm_continue
 
 message "Continue with installation..."
@@ -84,7 +149,7 @@ then
   message error "Your user $USER is not in group 'sudo'."
   message error "Add your user to the group with:"
   message error " ${YELLOW}su -c \"/usr/sbin/usermod -aG sudo ${USER}\"${ENDCOLOR}"
-  message error "after that logout and in again or reboot"
+  message error "after that, you need to reboot."
   error
 fi
 message "check sources.list"
@@ -137,7 +202,7 @@ do
   case $category in
     0-base)
       message "sed default grub option"
-      sudo sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT=\"quiet splash mem_sleep_default=deep\"/g' /etc/default/grub || error
+      sudo sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT=\"quiet splash\"/g' /etc/default/grub || error
       sudo update-grub
       ;;
 
@@ -152,11 +217,6 @@ do
       message "set firefox flatpak to default"
       xdg-settings set default-web-browser org.mozilla.firefox.desktop 
       
-      message "linking ~/.mozilla to flatpak env"
-      mkdir -p $HOME/.mozilla
-      mkdir -p $HOME/.var/app/org.mozilla.firefox/
-      ln -s $HOME/.mozilla $HOME/.var/app/org.mozilla.firefox/.mozilla
-      
       message "apply font fix for firefox flatpak"
       mkdir -p $HOME/.var/app/org.mozilla.firefox/config/fontconfig/
       cat << EOF > $HOME/.var/app/org.mozilla.firefox/config/fontconfig/fonts.conf
@@ -185,7 +245,6 @@ EOF
       gnome-extensions enable panel-osd@berend.de.schouwer.gmail.com
       gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com
       gnome-extensions enable dash-to-dock@micxgx.gmail.com
-      gnome-extensions enable system-monitor@paradoxxx.zero.gmail.com 
       gnome-extensions enable ding@rastersoft.com
       
       message "apply settings for dash-to-dock"
@@ -203,9 +262,6 @@ EOF
       gsettings set org.gnome.shell.extensions.dash-to-dock running-indicator-style 'DOTS'
       gsettings set org.gnome.shell.extensions.dash-to-dock icon-size-fixed true
       
-      message "apply settings for panel-osd"
-      # panel-osd
-      gsettings set org.gnome.shell.extensions.panel-osd x-pos 100.0
       
       message "apply settings for gnome desktop"
       # desktop