From c26d7e43b759270ec5bcbc188ee4d5e12196e296 Mon Sep 17 00:00:00 2001
From: OSAK Buildhauer <osak@fsmpi.rwth-aachen.de>
Date: Tue, 5 Feb 2019 20:09:55 +0000
Subject: [PATCH] =?UTF-8?q?Stuff=E2=84=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assemble_image.sh     |   4 +-
 create_offlinerepo.sh |   2 +-
 packages              | 122 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/assemble_image.sh b/assemble_image.sh
index d5908a4..fcc9251 100755
--- a/assemble_image.sh
+++ b/assemble_image.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-image_size="5G"
+image_size="7G"
 kubuntu="kubuntu-18.04.1-desktop-amd64.iso"
 xubuntu="xubuntu-18.04.1-desktop-amd64.iso"
 workspace="/workspace/"
@@ -26,7 +26,7 @@ rm -rf "$workspace/part_files"/grub
 
 cp "$kubuntu" "$workspace/part_files/kubuntu.iso"
 cp "$xubuntu" "$workspace/part_files/xubuntu.iso"
-./create_offlinerepo.sh "$workspace/part_files/archive" "$kubuntu" $(sed '/^#/d' packages | cut -d'|' -f 2)
+./create_offlinerepo.sh "$workspace/part_files/archive" "$kubuntu" $(grep '^[^#]' packages | cut -d'|' -f 2)
 cp packages "$workspace/part_files/packages"
 
 rm -f "$workspace/part.img"
diff --git a/create_offlinerepo.sh b/create_offlinerepo.sh
index acd43c3..8fd3963 100755
--- a/create_offlinerepo.sh
+++ b/create_offlinerepo.sh
@@ -38,7 +38,7 @@ apt-get -o Dir="$workspace"/offlinerepo/squashfs-root update
 {
 	apt-get -o Dir="$workspace"/offlinerepo/squashfs-root upgrade --print-uris -qq
 	apt-get -o Dir="$workspace"/offlinerepo/squashfs-root install --reinstall --print-uris -qq $packages
-} | cut -d"'" -f2 | while read url; do wget -nc -P "$dest" "$url"; done
+} | cut -d"'" -f2 | while read url; do wget -q -nc -P "$dest" "$url"; done
 apt-get -o Dir="$workspace"/offlinerepo/squashfs-root install --reinstall --print-uris -qq $packages
 
 mkdir -p "$dest/dists/$ISO_RELEASE/lip/binary-amd64"
diff --git a/packages b/packages
index d8c7451..b091d40 100644
--- a/packages
+++ b/packages
@@ -7,8 +7,7 @@
 #  m -> linuxparty-Bereich "Mathematik" ("M" für vorausgewählt)
 #  p -> linuxparty-Bereich "Physik" ("P" für vorausgewählt)
 #  i -> linuxparty-Bereich "Informatik" ("I" für vorausgewählt)
- P   |vim|Der beste Editor
- P   |htop|Das beste top
+
  C   |gufw|Firewall Frontend
  C   |pwgen|Tool um Passwoerter zu generieren
  C   |inkscape|Bildbearbeitung (Vektorbasiert)
@@ -50,3 +49,122 @@
     I|default-jdk|Java JDK für die Vorlesung Programmierung
     I|swi-prolog|Prolog Interpreter/Compiler für die Vorlesung Programmierung
    Pi|valgrind|Debugging- und Profilingtool, welches bei der Entwicklung von Programmen hilft.
+
+# Update installer if possible
+L    |ubiquity|
+L    |ubiquity-frontend-kde|
+
+#Desktop stuff for Kubuntu
+ P   |thunderbird|
+ P   |kfind|
+ P   |kompare|
+ P   |xloadimage|
+ P   |gpsd-clients|
+ P   |kde-config-gtk-style|
+ P   |ffmpeg|
+ P   |hunspell|
+ P   |vlc|
+ P   |p7zip-full|
+ P   |unrar-free|
+ P   |kile|
+ P   |okular|
+
+#Zenity for Linuxparty.sh
+     |zenity|
+
+#System stuff, e.g. gcc and efibootmgr
+ P   |automake|
+ P   |cmake|
+ P   |build-essential|
+ P   |lvm2|
+ P   |screen|
+ P   |tofrodos|
+ P   |efibootmgr|
+ P   |gdisk|
+ P   |linux-headers-generic|
+ P   |moreutils|
+ P   |network-manager-vpnc|
+LP   |vim|
+LP   |htop|
+LP   |git|
+ P   |gparted|
+ P   |grub-efi-amd64-signed|
+ P   |shim-signed|
+
+#texlive
+ P   |dvidvi|
+ P   |dvipng|
+ P   |texlive-music|
+ P   |tex4ht|
+ P   |texlive-lang-english|
+ P   |texlive-fonts-extra-doc|
+ P   |texlive-metapost-doc|
+ P   |texlive-bibtex-extra|
+ P   |tipa|
+ P   |lcdf-typetools|
+ P   |texlive-latex-extra|
+ P   |texlive-xetex|
+ P   |texlive-latex-base|
+ P   |texlive-science-doc|
+ P   |chktex|
+ P   |texlive-latex-recommended|
+ P   |texlive-latex-recommended-doc|
+ P   |texlive-lang-german|
+ P   |texlive-fonts-recommended|
+ P   |cm-super|
+ P   |texlive-humanities-doc|
+ P   |latex-cjk-all|
+ P   |texlive-games|
+ P   |psutils|
+ P   |texlive-extra-utils|
+ P   |texlive-font-utils|
+ P   |latexmk|
+ P   |texlive-latex-base-doc|
+ P   |texlive-publishers-doc|
+ P   |texlive-pstricks|
+ P   |texlive-latex-extra-doc|
+ P   |context|
+ P   |t1utils|
+ P   |texlive-fonts-extra|
+ P   |texlive-fonts-recommended-doc|
+ P   |lacheck|
+ P   |feynmf|
+ P   |texlive-omega|
+ P   |texlive-pictures-doc|
+ P   |prerex|
+ P   |purifyeps|
+ P   |texlive-formats-extra|
+ P   |texlive-science|
+ P   |texlive-pictures|
+ P   |texinfo|
+ P   |texlive-humanities|
+ P   |texlive-plain-extra|
+ P   |texlive-metapost|
+ P   |prosper|
+ P   |latexdiff|
+ P   |tex-gyre|
+ P   |texlive-publishers|
+ P   |texlive-generic-recommended|
+ P   |texlive-generic-extra|
+ P   |texlive-base|
+ P   |lmodern|
+ P   |texlive-luatex|
+ P   |fragmaster|
+ P   |texlive-binaries|
+ P   |texlive-pstricks-doc|
+ P   |info|
+
+#german language support
+ P   |hunspell-de-de|
+LP   |language-pack-de|
+ P   |wngerman|
+ P   |wogerman|
+ P   |wswiss|
+ P   |poppler-data|
+ P   |libreoffice-l10n-de|
+ P   |libreoffice-help-de|
+ P   |hyphen-de|
+ P   |mythes-de|
+ P   |aspell-de|
+ P   |thunderbird-locale-de|
+ P   |firefox-locale-de|
-- 
GitLab