diff --git a/setup/modules/optional-Modules/apps/blender.sh b/setup/modules/optional-Modules/apps/blender-povray.sh old mode 100755 new mode 100644 similarity index 100% rename from setup/modules/optional-Modules/apps/blender.sh rename to setup/modules/optional-Modules/apps/blender-povray.sh diff --git a/setup/modules/optional-Modules/apps/povray.sh b/setup/modules/optional-Modules/apps/povray.sh deleted file mode 100755 index bbe7d55..0000000 --- a/setup/modules/optional-Modules/apps/povray.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -euo pipefail - -sudo pacman -S --noconfirm --needed povray diff --git a/setup/modules/optional-Modules/apps/xournal.sh b/setup/modules/optional-Modules/apps/xournal.sh new file mode 100644 index 0000000..2209c4a --- /dev/null +++ b/setup/modules/optional-Modules/apps/xournal.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -euo pipefail + +sudo pacman -S --noconfirm --needed xournalpp diff --git a/setup/simple-install.sh b/setup/simple-install.sh index ca3c155..5ca6e96 100755 --- a/setup/simple-install.sh +++ b/setup/simple-install.sh @@ -308,8 +308,7 @@ count_steps() { [[ "$a" == *"disk-recovery"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"himalaya"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"gnuplot"* ]] && TOTAL=$(( TOTAL + 1 )) - [[ "$a" == *"povray"* ]] && TOTAL=$(( TOTAL + 1 )) - [[ "$a" == *"blender"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"blender-povray"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"toot"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"db-clients"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"mysql"* ]] && TOTAL=$(( TOTAL + 1 )) @@ -355,6 +354,7 @@ count_steps() { [[ "$a" == *"rdp-client"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"lamco-rdp-server"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"qemu"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"xournal"* ]] && TOTAL=$(( TOTAL + 1 )) } # ── Answerfile ──────────────────────────────────────────────────────────────── @@ -491,8 +491,7 @@ else "" "CLI Tools" header \ "himalaya" "Himalaya terminal email client (AUR)" off \ "gnuplot" "Gnuplot scientific plotting" off \ - "povray" "POV-Ray ray-tracing renderer" off \ - "blender" "Blender 3D creation suite" off \ + "blender-povray" "Blender + POV-Ray 3D modelling & ray-tracing" off \ "toot" "toot Mastodon CLI client (AUR)" off \ "db-clients" "DB Clients pgcli · mycli" off \ "mysql" "MySQL / MariaDB mariadb server + setup" off \ @@ -521,6 +520,7 @@ else "gimp" "GIMP GNU image manipulation program" off \ "inkscape" "Inkscape vector graphics editor" off \ "krita" "Krita digital painting application" off \ + "xournal" "Xournal++ note-taking & PDF annotator" off \ \ "" "Audio & Music" header \ "ardour" "Ardour professional DAW" off \ @@ -588,10 +588,10 @@ if ! $ANSWERFILE_MODE; then if [[ -n "$SELECTED_APPS" ]]; then SUMMARY+="\n Applications:\n" for _app in ollama llama-cpp open-webui claude networking-cli disk-recovery \ - himalaya gnuplot povray blender toot db-clients mysql productivity \ + himalaya gnuplot blender-povray toot db-clients mysql productivity \ yt-dlp sox imagemagick ffmpeg localtunnel butter tlp steam vesktop \ spotify prism vintagestory localsend croc onlyoffice \ - gimp inkscape krita ardour audacity lmms mixxx cecilia \ + gimp inkscape krita xournal ardour audacity lmms mixxx cecilia \ kdenlive openshot shotcut \ anti-malware timeshift wireshark k8s \ docker podman cockpit ssh-server freeipa-client freeipa-server \ @@ -637,8 +637,7 @@ fi [[ "$SELECTED_APPS" == *"disk-recovery"* ]] && run_module "Disk Recovery" "$APPS/disk-recovery.sh" [[ "$SELECTED_APPS" == *"himalaya"* ]] && run_module "Himalaya" "$APPS/himalaya.sh" [[ "$SELECTED_APPS" == *"gnuplot"* ]] && run_module "Gnuplot" "$APPS/gnuplot.sh" -[[ "$SELECTED_APPS" == *"povray"* ]] && run_module "POV-Ray" "$APPS/povray.sh" -[[ "$SELECTED_APPS" == *"blender"* ]] && run_module "Blender" "$APPS/blender.sh" +[[ "$SELECTED_APPS" == *"blender-povray"* ]] && run_module "Blender + POV-Ray" "$APPS/blender-povray.sh" [[ "$SELECTED_APPS" == *"toot"* ]] && run_module "toot" "$APPS/toot.sh" [[ "$SELECTED_APPS" == *"db-clients"* ]] && run_module "DB Clients" "$APPS/db-clients.sh" [[ "$SELECTED_APPS" == *"mysql"* ]] && run_module "MySQL / MariaDB" "$APPS/mysql.sh" @@ -661,6 +660,7 @@ fi [[ "$SELECTED_APPS" == *"gimp"* ]] && run_module "GIMP" "$APPS/gimp.sh" [[ "$SELECTED_APPS" == *"inkscape"* ]] && run_module "Inkscape" "$APPS/inkscape.sh" [[ "$SELECTED_APPS" == *"krita"* ]] && run_module "Krita" "$APPS/krita.sh" +[[ "$SELECTED_APPS" == *"xournal"* ]] && run_module "Xournal++" "$APPS/xournal.sh" [[ "$SELECTED_APPS" == *"ardour"* ]] && run_module "Ardour" "$APPS/ardour.sh" [[ "$SELECTED_APPS" == *"audacity"* ]] && run_module "Audacity" "$APPS/audacity.sh" [[ "$SELECTED_APPS" == *"lmms"* ]] && run_module "LMMS" "$APPS/lmms.sh" diff --git a/setup/tui-install.sh b/setup/tui-install.sh index bb551f7..33eb8fb 100755 --- a/setup/tui-install.sh +++ b/setup/tui-install.sh @@ -120,8 +120,7 @@ count_steps() { [[ "$a" == *"disk-recovery"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"himalaya"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"gnuplot"* ]] && TOTAL=$(( TOTAL + 1 )) - [[ "$a" == *"povray"* ]] && TOTAL=$(( TOTAL + 1 )) - [[ "$a" == *"blender"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"blender-povray"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"toot"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"db-clients"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"mysql"* ]] && TOTAL=$(( TOTAL + 1 )) @@ -167,6 +166,20 @@ count_steps() { [[ "$a" == *"rdp-client"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"lamco-rdp-server"* ]] && TOTAL=$(( TOTAL + 1 )) [[ "$a" == *"qemu"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"xournal"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"gimp"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"inkscape"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"krita"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"ardour"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"audacity"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"lmms"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"mixxx"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"cecilia"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"kdenlive"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"openshot"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"shotcut"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"anti-malware"* ]] && TOTAL=$(( TOTAL + 1 )) + [[ "$a" == *"timeshift"* ]] && TOTAL=$(( TOTAL + 1 )) } # ── Answerfile ──────────────────────────────────────────────────────────────── @@ -319,8 +332,7 @@ else "disk-recovery" "Disk Recovery ddrescue · f3" off \ "himalaya" "Himalaya terminal email client (AUR)" off \ "gnuplot" "Gnuplot scientific plotting" off \ - "povray" "POV-Ray ray-tracing renderer" off \ - "blender" "Blender 3D creation suite" off \ + "blender-povray" "Blender + POV-Ray 3D modelling & ray-tracing" off \ "toot" "toot Mastodon CLI client (AUR)" off \ "db-clients" "DB Clients pgcli · mycli" off \ "mysql" "MySQL / MariaDB mariadb server + setup" off \ @@ -340,6 +352,20 @@ else "localsend" "LocalSend LAN file transfer (AUR)" off \ "croc" "croc cross-platform file transfer" off \ "onlyoffice" "OnlyOffice office suite (AUR)" off \ + "xournal" "Xournal++ note-taking & PDF annotator" off \ + "gimp" "GIMP GNU image manipulation program" off \ + "inkscape" "Inkscape vector graphics editor" off \ + "krita" "Krita digital painting application" off \ + "ardour" "Ardour professional DAW" off \ + "audacity" "Audacity multi-track audio editor" off \ + "lmms" "LMMS Linux MultiMedia Studio DAW" off \ + "mixxx" "Mixxx DJ mixing software" off \ + "cecilia" "Cecilia audio signal processing (AUR)" off \ + "kdenlive" "Kdenlive KDE non-linear video editor" off \ + "openshot" "OpenShot easy video editor" off \ + "shotcut" "Shotcut cross-platform video editor" off \ + "anti-malware" "Anti-Malware ClamAV · rkhunter · chkrootkit" off \ + "timeshift" "Timeshift system snapshot / backup + autosnap" off \ "wireshark" "Wireshark network packet analyser (GUI)" off \ "k8s" "Kubernetes tools kubectl · podman-desktop" off \ "docker" "Docker docker · docker-compose" off \ @@ -392,8 +418,7 @@ if ! $ANSWERFILE_MODE; then [[ "$SELECTED_APPS" == *"disk-recovery"* ]] && SUMMARY+=" ✦ Disk Recovery (ddrescue, f3)\n" [[ "$SELECTED_APPS" == *"himalaya"* ]] && SUMMARY+=" ✦ Himalaya\n" [[ "$SELECTED_APPS" == *"gnuplot"* ]] && SUMMARY+=" ✦ Gnuplot\n" - [[ "$SELECTED_APPS" == *"povray"* ]] && SUMMARY+=" ✦ POV-Ray\n" - [[ "$SELECTED_APPS" == *"blender"* ]] && SUMMARY+=" ✦ Blender\n" + [[ "$SELECTED_APPS" == *"blender-povray"* ]] && SUMMARY+=" ✦ Blender + POV-Ray\n" [[ "$SELECTED_APPS" == *"toot"* ]] && SUMMARY+=" ✦ toot\n" [[ "$SELECTED_APPS" == *"db-clients"* ]] && SUMMARY+=" ✦ DB Clients (pgcli, mycli)\n" [[ "$SELECTED_APPS" == *"mysql"* ]] && SUMMARY+=" ✦ MySQL / MariaDB\n" @@ -413,6 +438,20 @@ if ! $ANSWERFILE_MODE; then [[ "$SELECTED_APPS" == *"localsend"* ]] && SUMMARY+=" ✦ LocalSend\n" [[ "$SELECTED_APPS" == *"croc"* ]] && SUMMARY+=" ✦ croc\n" [[ "$SELECTED_APPS" == *"onlyoffice"* ]] && SUMMARY+=" ✦ OnlyOffice\n" + [[ "$SELECTED_APPS" == *"xournal"* ]] && SUMMARY+=" ✦ Xournal++\n" + [[ "$SELECTED_APPS" == *"gimp"* ]] && SUMMARY+=" ✦ GIMP\n" + [[ "$SELECTED_APPS" == *"inkscape"* ]] && SUMMARY+=" ✦ Inkscape\n" + [[ "$SELECTED_APPS" == *"krita"* ]] && SUMMARY+=" ✦ Krita\n" + [[ "$SELECTED_APPS" == *"ardour"* ]] && SUMMARY+=" ✦ Ardour\n" + [[ "$SELECTED_APPS" == *"audacity"* ]] && SUMMARY+=" ✦ Audacity\n" + [[ "$SELECTED_APPS" == *"lmms"* ]] && SUMMARY+=" ✦ LMMS\n" + [[ "$SELECTED_APPS" == *"mixxx"* ]] && SUMMARY+=" ✦ Mixxx\n" + [[ "$SELECTED_APPS" == *"cecilia"* ]] && SUMMARY+=" ✦ Cecilia\n" + [[ "$SELECTED_APPS" == *"kdenlive"* ]] && SUMMARY+=" ✦ Kdenlive\n" + [[ "$SELECTED_APPS" == *"openshot"* ]] && SUMMARY+=" ✦ OpenShot\n" + [[ "$SELECTED_APPS" == *"shotcut"* ]] && SUMMARY+=" ✦ Shotcut\n" + [[ "$SELECTED_APPS" == *"anti-malware"* ]] && SUMMARY+=" ✦ Anti-Malware (ClamAV, rkhunter, chkrootkit)\n" + [[ "$SELECTED_APPS" == *"timeshift"* ]] && SUMMARY+=" ✦ Timeshift\n" [[ "$SELECTED_APPS" == *"wireshark"* ]] && SUMMARY+=" ✦ Wireshark\n" [[ "$SELECTED_APPS" == *"k8s"* ]] && SUMMARY+=" ✦ Kubernetes tools\n" [[ "$SELECTED_APPS" == *"docker"* ]] && SUMMARY+=" ✦ Docker + Compose\n" @@ -478,8 +517,7 @@ fi [[ "$SELECTED_APPS" == *"disk-recovery"* ]] && run_module "Disk Recovery" "$APPS/disk-recovery.sh" [[ "$SELECTED_APPS" == *"himalaya"* ]] && run_module "Himalaya" "$APPS/himalaya.sh" [[ "$SELECTED_APPS" == *"gnuplot"* ]] && run_module "Gnuplot" "$APPS/gnuplot.sh" -[[ "$SELECTED_APPS" == *"povray"* ]] && run_module "POV-Ray" "$APPS/povray.sh" -[[ "$SELECTED_APPS" == *"blender"* ]] && run_module "Blender" "$APPS/blender.sh" +[[ "$SELECTED_APPS" == *"blender-povray"* ]] && run_module "Blender + POV-Ray" "$APPS/blender-povray.sh" [[ "$SELECTED_APPS" == *"toot"* ]] && run_module "toot" "$APPS/toot.sh" [[ "$SELECTED_APPS" == *"db-clients"* ]] && run_module "DB Clients" "$APPS/db-clients.sh" [[ "$SELECTED_APPS" == *"mysql"* ]] && run_module "MySQL / MariaDB" "$APPS/mysql.sh" @@ -499,6 +537,20 @@ fi [[ "$SELECTED_APPS" == *"localsend"* ]] && run_module "LocalSend" "$APPS/localsend.sh" [[ "$SELECTED_APPS" == *"croc"* ]] && run_module "croc" "$APPS/croc.sh" [[ "$SELECTED_APPS" == *"onlyoffice"* ]] && run_module "OnlyOffice" "$APPS/onlyoffice.sh" +[[ "$SELECTED_APPS" == *"xournal"* ]] && run_module "Xournal++" "$APPS/xournal.sh" +[[ "$SELECTED_APPS" == *"gimp"* ]] && run_module "GIMP" "$APPS/gimp.sh" +[[ "$SELECTED_APPS" == *"inkscape"* ]] && run_module "Inkscape" "$APPS/inkscape.sh" +[[ "$SELECTED_APPS" == *"krita"* ]] && run_module "Krita" "$APPS/krita.sh" +[[ "$SELECTED_APPS" == *"ardour"* ]] && run_module "Ardour" "$APPS/ardour.sh" +[[ "$SELECTED_APPS" == *"audacity"* ]] && run_module "Audacity" "$APPS/audacity.sh" +[[ "$SELECTED_APPS" == *"lmms"* ]] && run_module "LMMS" "$APPS/lmms.sh" +[[ "$SELECTED_APPS" == *"mixxx"* ]] && run_module "Mixxx" "$APPS/mixxx.sh" +[[ "$SELECTED_APPS" == *"cecilia"* ]] && run_module "Cecilia" "$APPS/cecilia.sh" +[[ "$SELECTED_APPS" == *"kdenlive"* ]] && run_module "Kdenlive" "$APPS/kdenlive.sh" +[[ "$SELECTED_APPS" == *"openshot"* ]] && run_module "OpenShot" "$APPS/openshot.sh" +[[ "$SELECTED_APPS" == *"shotcut"* ]] && run_module "Shotcut" "$APPS/shotcut.sh" +[[ "$SELECTED_APPS" == *"anti-malware"* ]] && run_module "Anti-Malware" "$APPS/anti-malware.sh" +[[ "$SELECTED_APPS" == *"timeshift"* ]] && run_module "Timeshift" "$APPS/timeshift.sh" [[ "$SELECTED_APPS" == *"wireshark"* ]] && run_module "Wireshark" "$APPS/wireshark.sh" [[ "$SELECTED_APPS" == *"k8s"* ]] && run_module "Kubernetes Tools" "$APPS/k8s.sh" [[ "$SELECTED_APPS" == *"docker"* ]] && run_module "Docker" "$APPS/docker.sh"