Split packages for better customization and remove test infrastructure

build.sh

@@ -27,19 +27,17 @@ help_function()
   printf "\t-h for help\n"
   printf "\t-d Desktop: %s\n" "${desktop_list}"
   printf "\t-b Build type: unstable, testing, or release\n"
-  printf "\t-t Test: FreeBSD os packages\n"
    exit 1 # Exit script after printing help
 }
 # Set mate and release to be default
 export desktop="mate"
 export build_type="release"
 
-while getopts "d:b:th" opt
+while getopts "d:b:h" opt
 do
    case "$opt" in
       'd') export desktop="$OPTARG" ;;
       'b') export build_type="$OPTARG" ;;
-      't') export desktop="test" ; build_type="test";;
       'h') help_function ;;
       '?') help_function ;;
       *) help_function ;;
@@ -149,13 +147,8 @@ workspace()
 base()
 {
   log "Installing base system packages..."
-  if [ "${desktop}" = "test" ] ; then
-    base_list="$(cat "${cwd}/packages/test_base")"
-    vital_base="$(cat "${cwd}/packages/vital/test_base")"
-  else
-    base_list="$(cat "${cwd}/packages/base")"
-    vital_base="$(cat "${cwd}/packages/vital/base")"
-  fi
+  base_list="$(cat "${cwd}/packages/base")"
+  vital_base="$(cat "${cwd}/packages/vital/base")"
   mkdir -p ${release}/etc
   cp /etc/resolv.conf ${release}/etc/resolv.conf
   mkdir -p ${release}/var/cache/pkg

packages/common

@@ -1,7 +1,5 @@
 cups
 cups-filters
-drm-kmod
-evolution
 exfat-utils
 firefox
 fish
@@ -11,22 +9,16 @@ fusefs-ext2
 fusefs-hfsfuse
 fusefs-lkl
 fusefs-ntfs
-gbi
 ghostbsd-fonts
 ghostbsd-icons
 ghostbsd-utils
-gnome-keyring
 nss_mdns
 pc-sysinstall
 pkg
 python
-rhythmbox
-shotwell
-slick-greeter
-system-config-printer
 unzip
-vlc
 webrtc-audio-processing
 xconfig
 xorg-minimal
 zip
+zsh

packages/gershwin

@@ -1,4 +1,7 @@
+gbi
 gershwin-desktop
 gershwin-gbi-wrapper
 gershwin-ghostbsd-wrappers
 gershwin-firefox-wrapper
+slick-greeter
+vlc

packages/mate

@@ -1,8 +1,15 @@
 brisk-menu
 cursor-dmz-theme
 dconf-editor
+evolution
 freedesktop-sound-theme
 gbi
 ghostbsd-mate
+gnome-keyring
 plank
+rhythmbox
+shotwell
+slick-greeter
+system-config-printer
+vlc
 station-tweak

packages/mate_oem

@@ -1,43 +1,17 @@
 brisk-menu
-cpdup
-cups
-cups-filters
 cursor-dmz-theme
 dconf-editor
-drm-kmod
-en-aspell
-en-hunspell
-egl-wayland
 evolution
 feh
-firefox
-foomatic-db
 freedesktop-sound-theme
-fusefs-ext2
-fusefs-ntfs
-fusefs-simple-mtpfs
-gdk-pixbuf2
-ghostbsd-common-settings
-ghostbsd-drivers
-ghostbsd-fonts
-ghostbsd-icons
 ghostbsd-mate
-ghostbsd-utils
-gstreamer1-plugins-neon
-nss_mdns
-pkg
+gnome-keyring
+install-station
 plank
-python
 rhythmbox
+setup-station
 shotwell
 slick-greeter
-station-tweak
 system-config-printer
-utouch-kmod
-virtualbox-ose-additions
 vlc
-webrtc-audio-processing
-xconfig
-xf86-input-evdev
-xorg-minimal
-zip
+station-tweak

packages/plasma

@@ -6,6 +6,7 @@ kate
 ark
 kcalc
 kate
+gbi
 gwenview
 okular
 konsole