From 5d698ad774c062e1a7a13e5645da5d2f5a5b578a Mon Sep 17 00:00:00 2001
From: Marcus <marcus@deltalima.org>
Date: Mon, 12 Jun 2023 21:28:56 +0200
Subject: [PATCH] changes

---
 include/packages.inc.sh |  2 +-
 setup.sh                | 23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/include/packages.inc.sh b/include/packages.inc.sh
index 82c492a..1695fa3 100644
--- a/include/packages.inc.sh
+++ b/include/packages.inc.sh
@@ -20,7 +20,7 @@ thunderbird thunderbird-l10n-de"
 
 # install admin and dev tools
 packages[admin]="htop iotop sysstat lm-sensors git mc vim btop btrfs-progs 
-curl wget debootstrap geany 'geany-plugin*' lnav mtr-tiny ncdu nmap ppp 
+curl wget debootstrap geany geany-plugins lnav mtr-tiny ncdu nmap ppp 
 pandoc pwgen remmina rsync screen socat stress strace tcpdump ufw"
 
 # install nice programs
diff --git a/setup.sh b/setup.sh
index df93edc..ceaac81 100644
--- a/setup.sh
+++ b/setup.sh
@@ -62,17 +62,30 @@ fi
 message "Continue with installation..."
 
 # iterate through $packages
-for i in $package_categories
+for categorie in $package_categories
 do
   message "Packages category: ${YELLOW}${i}${ENDCOLOR}"
   message "Packages contained: "
   message "${GREEN}${packages[$i]}${ENDCOLOR}"
   
-  # in case of a specific category, do special things
-  case $i in
+  # pre installation steps for categories
+  case $categorie in
+    base)
+      if ! grep "contrib" /etc/apt/sources.list && grep "non-free" /etc/apt/sources.list
+        then
+          message error "please activate 'contrib' and 'non-free' in your sources.ist"
+      ;;
     nice)
-      message warn "sudo dpkg --add-architecture i386"
-      message warn "sudo apt update"
+      sudo dpkg --add-architecture i386
+      sudo apt update
       ;;
   esac
+  
+  # post installation steps for categories
+  case $categorie in
+    base)
+      
+      ;;
+  esac
+  
 done