From 55a17ad2cec013e73b7438412cc1276520250187 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 17 May 2018 01:04:21 +0200
Subject: [PATCH 01/55] beautysh

---
 src/func/on_exit | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/func/on_exit b/src/func/on_exit
index 0801b75..9a33c01 100755
--- a/src/func/on_exit
+++ b/src/func/on_exit
@@ -4,28 +4,28 @@
 
 #on_exit [error_level]
 function on_exit() {
-	#send log and errorlevel[success/errorr xy]
+  #send log and errorlevel[success/errorr xy]
 
-	if [ "$1" != "0" ]; then
-		log_mail_subject="$log_mail_subject [ERROR]"
-	else
-		log_mail_subject="$log_mail_subject [Success]"
-	fi
+  if [ "$1" != "0" ]; then
+    log_mail_subject="$log_mail_subject [ERROR]"
+  else
+    log_mail_subject="$log_mail_subject [Success]"
+  fi
 
-	#Mail Body:
-	for mail_aim in `echo "$log_mail_aim" | tr "," " "`; do
-		{
-			echo "$log_mail_subject"
-			echo $'####################################################################################\n\n'
-			cat "$log_file"
-		} | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
-	done
+  #Mail Body:
+  for mail_aim in `echo "$log_mail_aim" | tr "," " "`; do
+    {
+      echo "$log_mail_subject"
+      echo $'####################################################################################\n\n'
+      cat "$log_file"
+    } | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
+  done
 
-	[ "$1" != "0" ] && {
-		chroot_umount$distro "$chroot_path" 2> /dev/null
-		workspace_erase "$iso_extr_dir/" "$chroot_path/" 2> /dev/null
-	}
-	exit $1
+  [ "$1" != "0" ] && {
+    chroot_umount$distro "$chroot_path" 2> /dev/null
+    workspace_erase "$iso_extr_dir/" "$chroot_path/" 2> /dev/null
+  }
+  exit $1
 }
 
 #this func is standalone executable

From ca02c443d39beaa97310d8a36cc0a186b824a1d8 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 17 May 2018 01:05:56 +0200
Subject: [PATCH 02/55] make mail optional

---
 src/func/on_exit | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/func/on_exit b/src/func/on_exit
index 9a33c01..59774f1 100755
--- a/src/func/on_exit
+++ b/src/func/on_exit
@@ -4,23 +4,26 @@
 
 #on_exit [error_level]
 function on_exit() {
-  #send log and errorlevel[success/errorr xy]
+  ### send mail
+  [ -n "$log_mail_aim" ] && {
+    #send log and errorlevel[success/errorr xy]
+    if [ "$1" != "0" ]; then
+      log_mail_subject="$log_mail_subject [ERROR]"
+    else
+      log_mail_subject="$log_mail_subject [Success]"
+    fi
 
-  if [ "$1" != "0" ]; then
-    log_mail_subject="$log_mail_subject [ERROR]"
-  else
-    log_mail_subject="$log_mail_subject [Success]"
-  fi
-
-  #Mail Body:
-  for mail_aim in `echo "$log_mail_aim" | tr "," " "`; do
-    {
-      echo "$log_mail_subject"
-      echo $'####################################################################################\n\n'
-      cat "$log_file"
-    } | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
-  done
+    #Mail Body:
+    for mail_aim in `echo "$log_mail_aim" | tr "," " "`; do
+      {
+        echo "$log_mail_subject"
+        echo $'####################################################################################\n\n'
+        cat "$log_file"
+      } | sendemail -s "$log_mail_smtp" -f "$log_mail_source" -t "$mail_aim" -u "$log_mail_subject" -o tls=no
+    done
+  }
 
+  ### clean up
   [ "$1" != "0" ] && {
     chroot_umount$distro "$chroot_path" 2> /dev/null
     workspace_erase "$iso_extr_dir/" "$chroot_path/" 2> /dev/null

From d0c53279b5f58987a8d9b6b1256993174d69b51e Mon Sep 17 00:00:00 2001
From: 6543 <git+marddl@obermui.de>
Date: Sat, 19 May 2018 22:45:42 +0200
Subject: [PATCH 03/55] update Dependencys <- update feature

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 780fda9..b1c35b1 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ The aim of this Project is to create a daemon for a server, witch update live sy
 - wget
 - sed
 - sendemail
+- curl
 
 ## To Do
 

From 5767355c217d799313fd001e64a382f1511b8f17 Mon Sep 17 00:00:00 2001
From: 6543 <git+marddl@obermui.de>
Date: Sun, 20 May 2018 00:43:38 +0200
Subject: [PATCH 04/55] draft

---
 doc/Strukture.md | 80 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 61 insertions(+), 19 deletions(-)

diff --git a/doc/Strukture.md b/doc/Strukture.md
index f209963..ad599c5 100644
--- a/doc/Strukture.md
+++ b/doc/Strukture.md
@@ -1,28 +1,70 @@
-# Src
+1. Starte "remaster"
 
-raw scripts ..
+1.1 Lade Grundfunctionen                                      [-> #functions]
 
-## functions
+1.2 Überprüfe ...
+  * auf Updates
+  * auf Rechte
 
- - creat iso
- - burn cd ...
- - clean workspace ...
+1.3 Lade Richtige Einstellungen                               [-> #config]
+  * Lade /etc/remaster/<Conf>
+  * Überprüfe Conf. (Proj Exist; Mods Exist; ...)
 
+1.4 Lade Proj-Func                                            [-> #projects]
+  * Überlade nach Abhängigkeit
+  * (z.B.  ubuntu.16.04 -> ubuntu -> debian)
+  * Prüfe Conf. (Proj Conform)
 
-## distros
+1.5 Lade $n Mods (optional)                                   [-> #mods]
+  * Überprüfen
+  * Spechern in MOD_LST
 
-scripts vor distros
- - update
- - set network settings
- - set OS settings
+2. Init Chroot
 
-## mods
- - for example: install & enable xrdp
- - set default passwd
- - ...
+2.1 Dateien Entpacken
+  * ISO
+  * Squashfs
 
-## web
-placeholder for webfiles ...
+2.2 Config für Chroot (chroot_initial)
+  * (lxc-conf / tmpdir)
+  * Netzwerk
 
-## pxe
-placeholder for pxefiles ...
+2.3 Starte Chroot
+  * (lxc-start / mount ...)
+
+3. Modivikationen
+
+3.1 Netzwerk
+
+3.2 Proj-Spez.
+  * (z.B. Desinfect: conky_info)
+
+3.3 Packet Mgr
+  * Updates
+  * Install
+  * Delete
+
+3.4 Weitere in $MOD_LST
+  * z.B. xrdp
+  * z.B. default pw
+
+4. Finish
+
+4.1 Aufreumen Live-Sys
+  * tmpfiles
+  * Packet Mgr
+
+4.2 Stop chroot
+  * Umount
+
+4.3. Gen ISO/PXE
+
+4.4. Del Chroot
+
+5. Send Log
+
+----
+
+lxc
+-> chroot_sh exec lxc-attach
+-> chroot_dir = container name

From 897ddfd3a613ba7ab4c9448c033ed83fbcaff351 Mon Sep 17 00:00:00 2001
From: 6543 <git+marddl@obermui.de>
Date: Sun, 20 May 2018 01:13:03 +0200
Subject: [PATCH 05/55] format

---
 doc/Strukture.md | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/doc/Strukture.md b/doc/Strukture.md
index ad599c5..bd90ec3 100644
--- a/doc/Strukture.md
+++ b/doc/Strukture.md
@@ -1,67 +1,67 @@
-1. Starte "remaster"
+# 1. Starte "remaster"
 
-1.1 Lade Grundfunctionen                                      [-> #functions]
+## 1.1 Lade Grundfunctionen                                      [-> #functions]
 
-1.2 Überprüfe ...
+## 1.2 Überprüfe ...
   * auf Updates
   * auf Rechte
 
-1.3 Lade Richtige Einstellungen                               [-> #config]
+## 1.3 Lade Richtige Einstellungen                               [-> #config]
   * Lade /etc/remaster/<Conf>
   * Überprüfe Conf. (Proj Exist; Mods Exist; ...)
 
-1.4 Lade Proj-Func                                            [-> #projects]
+## 1.4 Lade Proj-Func                                            [-> #projects]
   * Überlade nach Abhängigkeit
   * (z.B.  ubuntu.16.04 -> ubuntu -> debian)
   * Prüfe Conf. (Proj Conform)
 
-1.5 Lade $n Mods (optional)                                   [-> #mods]
+## 1.5 Lade $n Mods (optional)                                   [-> #mods]
   * Überprüfen
   * Spechern in MOD_LST
 
-2. Init Chroot
+# 2. Init Chroot
 
-2.1 Dateien Entpacken
+## 2.1 Dateien Entpacken
   * ISO
   * Squashfs
 
-2.2 Config für Chroot (chroot_initial)
+## 2.2 Config für Chroot (chroot_initial)
   * (lxc-conf / tmpdir)
   * Netzwerk
 
-2.3 Starte Chroot
+## 2.3 Starte Chroot
   * (lxc-start / mount ...)
 
-3. Modivikationen
+# 3. Modivikationen
 
-3.1 Netzwerk
+## 3.1 Netzwerk
 
-3.2 Proj-Spez.
+## 3.2 Proj-Spez.
   * (z.B. Desinfect: conky_info)
 
-3.3 Packet Mgr
+## 3.3 Packet Mgr
   * Updates
   * Install
   * Delete
 
-3.4 Weitere in $MOD_LST
+## 3.4 Weitere in $MOD_LST
   * z.B. xrdp
   * z.B. default pw
 
-4. Finish
+# 4. Finish
 
-4.1 Aufreumen Live-Sys
+## 4.1 Aufreumen Live-Sys
   * tmpfiles
   * Packet Mgr
 
-4.2 Stop chroot
+## 4.2 Stop chroot
   * Umount
 
-4.3. Gen ISO/PXE
+## 4.3. Gen ISO/PXE
 
-4.4. Del Chroot
+## 4.4. Del Chroot
 
-5. Send Log
+# 5. Send Log
 
 ----
 

From ff9a384ce636589fb24156fda5b292e9e0131d34 Mon Sep 17 00:00:00 2001
From: 6543 <git+marddl@obermui.de>
Date: Sun, 20 May 2018 01:29:25 +0200
Subject: [PATCH 06/55] draft_v2

---
 doc/Strukture.md | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/doc/Strukture.md b/doc/Strukture.md
index bd90ec3..434d51f 100644
--- a/doc/Strukture.md
+++ b/doc/Strukture.md
@@ -65,6 +65,47 @@
 
 ----
 
-lxc
+## lxc
+
 -> chroot_sh exec lxc-attach
+
 -> chroot_dir = container name
+
+----
+
+## PXE
+
+-> Install
+  * DHCP Relay
+  * NFS-Server
+  * TFTP-Server
+  * [Samba]
+
+-> Setup
+  * (use <Lib>/proj/<proj> func)
+  * SMB/NFS LiveSys export
+  * TFTP (Boot Menue; Boot Loader; Kernel&Initrd)
+
+-> Deinstall
+  * RM TFTP-Root
+  * RM SMB/NFS LiveSys export
+  * del DHCP Relay conf
+
+----
+
+## Jobs
+
+----
+
+## Web
+
+show/edit #Configs
+
+show (+live) #Logs
+
+start/stop/plan #Jobs
+
+start/stop/edit #PXE menue
+  * default
+  * all / single / none
+  * live view new clients

From 6aa13ce326d79e810d589f4390b489d326b6512c Mon Sep 17 00:00:00 2001
From: 6543 <git+marddl@obermui.de>
Date: Sun, 20 May 2018 01:34:10 +0200
Subject: [PATCH 07/55] draft_v3

---
 doc/Strukture.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/Strukture.md b/doc/Strukture.md
index 434d51f..0a6e53f 100644
--- a/doc/Strukture.md
+++ b/doc/Strukture.md
@@ -94,6 +94,8 @@
 ----
 
 ## Jobs
+  * Read Confs -> get time interfall I
+  * Exec remaster <Conf> for I
 
 ----
 

From d65cddc2f5a6495713b14d5710fa0785933ce7a0 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 11:59:47 +0200
Subject: [PATCH 08/55] proxy optional

---
 src/remaster.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/remaster.sh b/src/remaster.sh
index 9fded8b..4abfee6 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -113,9 +113,10 @@ function main_renew() {
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 5. Setzen der Netzwerk-Einstellungen:
-
-  proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+  [ -n "$proxy_host" ] && {
+    proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
+    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+  }
 
   dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
@@ -397,9 +398,10 @@ function main_update_iso() {
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 5. Setzen der Netzwerk-Einstellungen:
-
-  proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+  [ -n "$proxy_host" ] && {
+    proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
+    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+  }
 
   dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"

From 22c8d8081eaad2f00639eefb344a31e8ad5ec8bd Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 12:24:51 +0200
Subject: [PATCH 09/55] Load check_update func

---
 src/remaster.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/remaster.sh b/src/remaster.sh
index 9fded8b..449fc61 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -490,6 +490,8 @@ source <LIBDIR>/func/check_user
 # -> 0 | -> 16
 source <LIBDIR>/func/check_dependency
 
+#check_update
+source <LIBDIR>/func/check_update
 
 ### Workspace ###
 

From fb4afed081f92630905076b79f8a9d53c279e1ad Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 20:32:55 +0200
Subject: [PATCH 10/55] subvers

---
 DEBIAN/control        | 2 +-
 changes/remaster.md   | 4 ++++
 script/get_version.sh | 3 +++
 script/set_version.sh | 6 +++---
 src/remaster.sh       | 4 ++--
 5 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100755 script/get_version.sh

diff --git a/DEBIAN/control b/DEBIAN/control
index e35de60..546040e 100644
--- a/DEBIAN/control
+++ b/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: remaster
 Source: remaster
-Version: 2.0.2
+Version: 2.0.2-2
 Architecture: all
 Maintainer: 6543 <6543@obermui.de>
 Installed-Size: <SIZE>
diff --git a/changes/remaster.md b/changes/remaster.md
index eb79d3f..d910dfe 100644
--- a/changes/remaster.md
+++ b/changes/remaster.md
@@ -18,3 +18,7 @@
 
 2018-05-13 - 2.0.2
  * hotfix-2.0.2 ( create release folder if not exist )
+
+2018-05-20 - 2.0.2-2
+ * make email, proxy optional
+ * change Strukture.md
diff --git a/script/get_version.sh b/script/get_version.sh
new file mode 100755
index 0000000..e58d5ec
--- /dev/null
+++ b/script/get_version.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+grep '@version ' src/remaster.sh | cut -d " " -f 2
diff --git a/script/set_version.sh b/script/set_version.sh
index d170fe9..e012b21 100755
--- a/script/set_version.sh
+++ b/script/set_version.sh
@@ -8,10 +8,10 @@ date=`date +%Y-%m-%d`
   version_sed=`echo $version | sed 's/\./\\./g'`
 
   #nummer
-  sed -i "s/@version\ .\..\../@version\ $version_sed/g" src/remaster.sh
+  sed -i "/#@version\ /c\#@version\ $version_sed" src/remaster.sh
 
   #datum
-  sed -i "s/@date\ ....-..-../@date\ $date/g" src/remaster.sh
+  sed -i "/#@date\ /c\#@date\ $date" src/remaster.sh
 }
 
 [ -e "changes/remaster.md" ] && {
@@ -22,5 +22,5 @@ date=`date +%Y-%m-%d`
 }
 
 [ -f "DEBIAN/control" ] && {
-  sed -i "s/Version:\ .\..\../Version:\ $version_sed/g" "DEBIAN/control"
+  sed -i "/Version:\ /c\Version:\ $version_sed" "DEBIAN/control"
 }
diff --git a/src/remaster.sh b/src/remaster.sh
index 5a740d3..8874202 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#@version 2.0.2
+#@version 2.0.2-2
 #@autor 6543@obermui.de
-#@date 2018-05-13
+#@date 2018-05-20
 #@licence GNUv3
 
 #####################################################################################

From 3510f44ef8dad9e643b307a922b5d7c9515f9a73 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 20:50:06 +0200
Subject: [PATCH 11/55] appropriate name

---
 doc/{lib-header.txt => lib-head+tail} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename doc/{lib-header.txt => lib-head+tail} (100%)

diff --git a/doc/lib-header.txt b/doc/lib-head+tail
similarity index 100%
rename from doc/lib-header.txt
rename to doc/lib-head+tail

From 051f8636a29113521c1d223b8708d8f21122b79b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 21:02:45 +0200
Subject: [PATCH 12/55] init check_config

---
 src/func/check_config | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100755 src/func/check_config

diff --git a/src/func/check_config b/src/func/check_config
new file mode 100755
index 0000000..2b68c8c
--- /dev/null
+++ b/src/func/check_config
@@ -0,0 +1,13 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#<function>
+function <function>() {
+    #Code of <function>
+}
+
+#this func is standalone executable
+[ -n "$1" ] && {
+    <function> $@
+}

From 89053e3ed19c816cb103f4ef701e201c8f348ad4 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 21:16:19 +0200
Subject: [PATCH 13/55] add script

---
 doc/lib-head+tail      |  8 +++++---
 script/add_function.sh | 12 ++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100755 script/add_function.sh

diff --git a/doc/lib-head+tail b/doc/lib-head+tail
index d3c48f7..597257f 100644
--- a/doc/lib-head+tail
+++ b/doc/lib-head+tail
@@ -2,10 +2,12 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
-#beginn func
-
+#<function> [param]
+function <function>() {
+    #Code of <function>
+}
 
 #this func is standalone executable
 [ -n "$1" ] && {
-    check_user
+    <function> $@
 }
diff --git a/script/add_function.sh b/script/add_function.sh
new file mode 100755
index 0000000..17bd495
--- /dev/null
+++ b/script/add_function.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#check param
+[ -z "$1" ] && { echo "$0 [name]"; exit 1; }
+name="$1"
+
+#gen function
+cp "doc/lib-head+tail" "src/func/$name"
+sed -i "s/<function>/$name/g" "src/func/$name"
+
+#open
+editor "src/func/$name"

From d11b96947c532ac2fa34bfa3f144cdfc79c6040c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 21:53:56 +0200
Subject: [PATCH 14/55] add log check

---
 src/func/check_config | 27 +++++++++++++++++++++++----
 src/remaster.sh       |  8 +++-----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/func/check_config b/src/func/check_config
index 2b68c8c..3a0653f 100755
--- a/src/func/check_config
+++ b/src/func/check_config
@@ -2,12 +2,31 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
-#<function>
-function <function>() {
-    #Code of <function>
+#check_config [param]
+function check_config() {
+
+    #LOG
+    [ -z "$log_file" ] && log_file="/tmp/remaster_`date '+%Y-%m-%d'`"
+
+    if [ -f "$log_file" ]; then
+        echo > "$log_file"
+    else
+        #check if folder exist
+        [ -d "${log_file%/*}" ] || {
+            # N-> exit 3
+            echo "Directory for Log didnt exist"
+            exit 3
+        }
+        #create LOG
+        touch "$log_file"
+    fi
+
+
+
+
 }
 
 #this func is standalone executable
 [ -n "$1" ] && {
-    <function> $@
+    check_config $@
 }
diff --git a/src/remaster.sh b/src/remaster.sh
index 8874202..dd6202f 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -32,8 +32,7 @@ fi
 
 #remaster.sh renew
 function main_renew() {
-
-  [ -f "$log_file" ] || touch "$log_file"
+  check_config
   tail -f "$log_file" --pid="$$" &
 
   chroot_path="`mktemp -d`"
@@ -195,8 +194,7 @@ function main_renew() {
 #remaster.sh update_pxe
 function main_update_pxe() {
 
-  [ "$log_file" == "" ] && log_file="`mktemp`"
-  [ -f "$log_file" ] || touch "$log_file"
+  check_config
   tail -f "$log_file" --pid="$$" &
 
   chroot_path="`mktemp -d`"
@@ -308,7 +306,7 @@ function main_update_pxe() {
 
 #remaster.sh update_iso #in arbeit
 function main_update_iso() {
-  [ -f "$log_file" ] || touch "$log_file"
+  check_config
   tail -f "$log_file" --pid="$$" &
 
   chroot_path="`mktemp -d`"

From 74b3a8b12bca42b48edb4c4a11e6e694628d6e92 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 22:43:33 +0200
Subject: [PATCH 15/55] log check at init

---
 src/func/check_config | 15 ++++++++-------
 src/remaster.sh       | 32 +++++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/func/check_config b/src/func/check_config
index 3a0653f..0b1ccec 100755
--- a/src/func/check_config
+++ b/src/func/check_config
@@ -2,15 +2,17 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
-#check_config [param]
+#check_config [log_file]
 function check_config() {
 
     #LOG
-    [ -z "$log_file" ] && log_file="/tmp/remaster_`date '+%Y-%m-%d'`"
+    {
+      log_file=$1
+      [ -z "$log_file" ] && log_file="/tmp/remaster_`date '+%Y-%m-%d'`"
 
-    if [ -f "$log_file" ]; then
+      if [ -f "$log_file" ]; then
         echo > "$log_file"
-    else
+      else
         #check if folder exist
         [ -d "${log_file%/*}" ] || {
             # N-> exit 3
@@ -19,9 +21,8 @@ function check_config() {
         }
         #create LOG
         touch "$log_file"
-    fi
-
-
+      fi
+    }
 
 
 }
diff --git a/src/remaster.sh b/src/remaster.sh
index dd6202f..be7d97c 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -25,6 +25,23 @@ else
     exit 1
   fi
 fi
+#check LOG
+{
+  [ -z "$log_file" ] && log_file="/tmp/remaster_`date '+%Y-%m-%d'`"
+
+  if [ -f "$log_file" ]; then
+    echo > "$log_file"
+  else
+    #check if folder exist
+    [ -d "${log_file%/*}" ] || {
+        # N-> exit 3
+        echo "Directory for Log didnt exist"
+        exit 3
+    }
+    #create LOG
+    touch "$log_file"
+  fi
+}
 
 #####################################################################################
 ################## M o d e s ########################################################
@@ -32,7 +49,7 @@ fi
 
 #remaster.sh renew
 function main_renew() {
-  check_config
+  #Start LOG
   tail -f "$log_file" --pid="$$" &
 
   chroot_path="`mktemp -d`"
@@ -89,6 +106,9 @@ function main_renew() {
   check_dependency
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
+  check_config "$log_file"
+  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
   check_update | tee -a "$log_file"
 
   [ "$distro" != "" ] && distro="_$distro"
@@ -194,7 +214,7 @@ function main_renew() {
 #remaster.sh update_pxe
 function main_update_pxe() {
 
-  check_config
+  #Start LOG
   tail -f "$log_file" --pid="$$" &
 
   chroot_path="`mktemp -d`"
@@ -243,6 +263,9 @@ function main_update_pxe() {
   check_dependency
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
+  check_config "$log_file"
+  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
   [ "$distro" != "" ] && distro="_$distro"
 
   # 1. Entpacken der Dateien des Live-Systems
@@ -306,7 +329,7 @@ function main_update_pxe() {
 
 #remaster.sh update_iso #in arbeit
 function main_update_iso() {
-  check_config
+  #Start LOG
   tail -f "$log_file" --pid="$$" &
 
   chroot_path="`mktemp -d`"
@@ -365,6 +388,9 @@ function main_update_iso() {
   check_dependency
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
+  check_config "$log_file"
+  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
   [ "$distro" != "" ] && distro="_$distro"
 
   # 2. Entpacke ISO

From 8b782fa5e1eb7b12a56c61bf9ebf184258d85976 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 22:44:33 +0200
Subject: [PATCH 16/55] add live-system files check

---
 src/func/check_config | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/func/check_config b/src/func/check_config
index 0b1ccec..19eddeb 100755
--- a/src/func/check_config
+++ b/src/func/check_config
@@ -25,6 +25,37 @@ function check_config() {
     }
 
 
+    #check live-system files
+    if [ -f "$iso_source" ]; then
+        if [ -n "$iso_destination" ] && [ -d "${iso_destination%/*}" ]; then
+            # iso_source -> iso_destination
+            # iso_source -> squashfs [optinal]
+        else
+            if [ -n "$filesystem_source" ] && [ -d "${filesystem_source%/*}" ]; then
+                # iso_source -> squashfs
+            else
+                # ERROR
+                echo "No corect AIM in Settings" | tee -a "$log_file"
+                return 3
+            fi
+        fi
+    else
+        if [ -f "$filesystem_source" ]; then
+            if [ -n "$iso_destination" ]; then
+                # ERROR
+                echo "only Squashfs source in Settings, cant creat ISO" | tee -a "$log_file"
+                return 3
+            else
+                # squashfs -> squashfs
+            fi
+        else
+            # ERROR
+            echo "No corect Source in Settings" | tee -a "$log_file"
+            return 3
+        fi
+    fi
+
+
 }
 
 #this func is standalone executable

From cdf2cc900e7c9e4dea0221f293a7e80beb29548d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 22:52:20 +0200
Subject: [PATCH 17/55] add project check

---
 src/func/check_config | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/func/check_config b/src/func/check_config
index 19eddeb..d3e33b8 100755
--- a/src/func/check_config
+++ b/src/func/check_config
@@ -25,6 +25,13 @@ function check_config() {
     }
 
 
+
+    #Project
+    [ -f "<LIBDIR>/proj/$distro" ] || {
+        echo "No Project \"$distrp\" is not supported" | tee -a "$log_file"
+        return 3
+    }
+
     #check live-system files
     if [ -f "$iso_source" ]; then
         if [ -n "$iso_destination" ] && [ -d "${iso_destination%/*}" ]; then

From 242421fbabcdbe1d10b602749341ea0a7d99546b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 22:53:00 +0200
Subject: [PATCH 18/55] format...

---
 src/func/check_config | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/func/check_config b/src/func/check_config
index d3e33b8..4e413dc 100755
--- a/src/func/check_config
+++ b/src/func/check_config
@@ -32,7 +32,7 @@ function check_config() {
         return 3
     }
 
-    #check live-system files
+    #live-system files
     if [ -f "$iso_source" ]; then
         if [ -n "$iso_destination" ] && [ -d "${iso_destination%/*}" ]; then
             # iso_source -> iso_destination
@@ -63,6 +63,8 @@ function check_config() {
     fi
 
 
+
+
 }
 
 #this func is standalone executable

From 6ce556ef8423acbbd63a9d9f45135bcbb5b6957b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 22:55:54 +0200
Subject: [PATCH 19/55] add lable; smal fix

---
 src/func/check_config | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/func/check_config b/src/func/check_config
index 4e413dc..aeb7e5f 100755
--- a/src/func/check_config
+++ b/src/func/check_config
@@ -28,13 +28,16 @@ function check_config() {
 
     #Project
     [ -f "<LIBDIR>/proj/$distro" ] || {
-        echo "No Project \"$distrp\" is not supported" | tee -a "$log_file"
+        echo "No Project \"$distro\" is not supported" | tee -a "$log_file"
         return 3
     }
 
     #live-system files
     if [ -f "$iso_source" ]; then
         if [ -n "$iso_destination" ] && [ -d "${iso_destination%/*}" ]; then
+            #Lable
+            [ -z "$iso_lable" ] && iso_lable="$distro"
+
             # iso_source -> iso_destination
             # iso_source -> squashfs [optinal]
         else

From 310b670631fcf3071a829e1aaad7aea58b38245c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 23:04:52 +0200
Subject: [PATCH 20/55] aktivate

---
 src/remaster.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/remaster.sh b/src/remaster.sh
index be7d97c..17b3d2b 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -503,6 +503,9 @@ function main_update_iso() {
 
 ### Error Handlings ###
 
+#check_config [log_file]
+source <LIBDIR>/func/check_config
+
 #on_exit [error_level]
 source <LIBDIR>/func/on_exit
 

From 20bb090cb3f56f051c23840d2b170c79b1c78b50 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 23:12:12 +0200
Subject: [PATCH 21/55] fixes...

---
 src/func/check_config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/func/check_config b/src/func/check_config
index aeb7e5f..8bed903 100755
--- a/src/func/check_config
+++ b/src/func/check_config
@@ -38,11 +38,11 @@ function check_config() {
             #Lable
             [ -z "$iso_lable" ] && iso_lable="$distro"
 
-            # iso_source -> iso_destination
-            # iso_source -> squashfs [optinal]
+            echo 'iso_source -> iso_destination' | tee -a "$log_file"
+            echo 'iso_source -> squashfs [optinal]' | tee -a "$log_file"
         else
             if [ -n "$filesystem_source" ] && [ -d "${filesystem_source%/*}" ]; then
-                # iso_source -> squashfs
+                echo 'iso_source -> squashfs' | tee -a "$log_file"
             else
                 # ERROR
                 echo "No corect AIM in Settings" | tee -a "$log_file"
@@ -56,7 +56,7 @@ function check_config() {
                 echo "only Squashfs source in Settings, cant creat ISO" | tee -a "$log_file"
                 return 3
             else
-                # squashfs -> squashfs
+                echo 'squashfs -> squashfs' | tee -a "$log_file"
             fi
         else
             # ERROR

From cee345cd257f26725fe9312479e141ab368c7600 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 23:16:24 +0200
Subject: [PATCH 22/55] fix until name change

---
 src/proj/desinfect2017 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/proj/desinfect2017

diff --git a/src/proj/desinfect2017 b/src/proj/desinfect2017
new file mode 100644
index 0000000..e69de29

From c0ddfe7c1c2e892fe69cd69822ef493881413b01 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 23:29:33 +0200
Subject: [PATCH 23/55] v 2.0.3

---
 DEBIAN/control      | 2 +-
 changes/remaster.md | 4 +++-
 src/remaster.sh     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/DEBIAN/control b/DEBIAN/control
index 546040e..132f7d0 100644
--- a/DEBIAN/control
+++ b/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: remaster
 Source: remaster
-Version: 2.0.2-2
+Version: 2.0.3
 Architecture: all
 Maintainer: 6543 <6543@obermui.de>
 Installed-Size: <SIZE>
diff --git a/changes/remaster.md b/changes/remaster.md
index d910dfe..d5f582d 100644
--- a/changes/remaster.md
+++ b/changes/remaster.md
@@ -19,6 +19,8 @@
 2018-05-13 - 2.0.2
  * hotfix-2.0.2 ( create release folder if not exist )
 
-2018-05-20 - 2.0.2-2
+2018-05-20 - 2.0.3
  * make email, proxy optional
  * change Strukture.md
+ * add config check
+ * some help scripts
diff --git a/src/remaster.sh b/src/remaster.sh
index 17b3d2b..391083b 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-#@version 2.0.2-2
+#@version 2.0.3
 #@autor 6543@obermui.de
 #@date 2018-05-20
 #@licence GNUv3

From 9301b1a39c0c6ad0a9f928d2ea38d2efd346cf07 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 20 May 2018 23:44:26 +0200
Subject: [PATCH 24/55] fix duble report

---
 src/func/check_config | 39 +++++++++------------------------------
 src/func/check_update |  4 ++--
 src/remaster.sh       | 14 +++++++-------
 3 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/src/func/check_config b/src/func/check_config
index 8bed903..fcb70b0 100755
--- a/src/func/check_config
+++ b/src/func/check_config
@@ -2,33 +2,12 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
-#check_config [log_file]
+#check_config
 function check_config() {
 
-    #LOG
-    {
-      log_file=$1
-      [ -z "$log_file" ] && log_file="/tmp/remaster_`date '+%Y-%m-%d'`"
-
-      if [ -f "$log_file" ]; then
-        echo > "$log_file"
-      else
-        #check if folder exist
-        [ -d "${log_file%/*}" ] || {
-            # N-> exit 3
-            echo "Directory for Log didnt exist"
-            exit 3
-        }
-        #create LOG
-        touch "$log_file"
-      fi
-    }
-
-
-
     #Project
     [ -f "<LIBDIR>/proj/$distro" ] || {
-        echo "No Project \"$distro\" is not supported" | tee -a "$log_file"
+        echo "No Project \"$distro\" is not supported"
         return 3
     }
 
@@ -38,14 +17,14 @@ function check_config() {
             #Lable
             [ -z "$iso_lable" ] && iso_lable="$distro"
 
-            echo 'iso_source -> iso_destination' | tee -a "$log_file"
-            echo 'iso_source -> squashfs [optinal]' | tee -a "$log_file"
+            echo 'iso_source -> iso_destination'
+            echo 'iso_source -> squashfs [optinal]'
         else
             if [ -n "$filesystem_source" ] && [ -d "${filesystem_source%/*}" ]; then
-                echo 'iso_source -> squashfs' | tee -a "$log_file"
+                echo 'iso_source -> squashfs'
             else
                 # ERROR
-                echo "No corect AIM in Settings" | tee -a "$log_file"
+                echo "No corect AIM in Settings"
                 return 3
             fi
         fi
@@ -53,14 +32,14 @@ function check_config() {
         if [ -f "$filesystem_source" ]; then
             if [ -n "$iso_destination" ]; then
                 # ERROR
-                echo "only Squashfs source in Settings, cant creat ISO" | tee -a "$log_file"
+                echo "only Squashfs source in Settings, cant creat ISO"
                 return 3
             else
-                echo 'squashfs -> squashfs' | tee -a "$log_file"
+                echo 'squashfs -> squashfs'
             fi
         else
             # ERROR
-            echo "No corect Source in Settings" | tee -a "$log_file"
+            echo "No corect Source in Settings"
             return 3
         fi
     fi
diff --git a/src/func/check_update b/src/func/check_update
index 7a1847d..79d6d99 100755
--- a/src/func/check_update
+++ b/src/func/check_update
@@ -5,9 +5,9 @@
 #check_update
 function check_update() {
     if curl https://raw.githubusercontent.com/6543/remaster/master/changes/remaster.md | diff - <(zcat <ROOTDIR>/usr/share/doc/remaster/changelog.gz ); then
-			echo 'REMASTER: Aktuell'
+			echo 'INFO: Programm Aktuell'
 	else
-			echo 'REMASTER: Warning: neue Version verfügbar'
+			echo 'WARNUNG: neue Version verfügbar'
     fi
 }
 
diff --git a/src/remaster.sh b/src/remaster.sh
index 391083b..ddcd498 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -106,10 +106,10 @@ function main_renew() {
   check_dependency
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  check_config "$log_file"
+  check_config >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  check_update | tee -a "$log_file"
+  check_update >> "$log_file"
 
   [ "$distro" != "" ] && distro="_$distro"
 
@@ -258,12 +258,12 @@ function main_update_pxe() {
   check_user
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  check_update | tee -a "$log_file"
+  check_update >> "$log_file"
 
   check_dependency
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  check_config "$log_file"
+  check_config >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   [ "$distro" != "" ] && distro="_$distro"
@@ -383,12 +383,12 @@ function main_update_iso() {
   check_user
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  check_update | tee -a "$log_file"
+  check_update >> "$log_file"
 
   check_dependency
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  check_config "$log_file"
+  check_config >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   [ "$distro" != "" ] && distro="_$distro"
@@ -503,7 +503,7 @@ function main_update_iso() {
 
 ### Error Handlings ###
 
-#check_config [log_file]
+#check_config
 source <LIBDIR>/func/check_config
 
 #on_exit [error_level]

From 6076f1372d35cd9d48dab2b8e27c137520ccd695 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 00:16:26 +0200
Subject: [PATCH 25/55] docu ...

---
 doc/check_config/live-system-files.pdf | Bin 0 -> 17251 bytes
 doc/check_config/live-system-files.stg | Bin 0 -> 533 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 doc/check_config/live-system-files.pdf
 create mode 100644 doc/check_config/live-system-files.stg

diff --git a/doc/check_config/live-system-files.pdf b/doc/check_config/live-system-files.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..334ec1e319dc67a2bcca320ecc356c4260cd1fb1
GIT binary patch
literal 17251
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

literal 0
HcmV?d00001

diff --git a/doc/check_config/live-system-files.stg b/doc/check_config/live-system-files.stg
new file mode 100644
index 0000000000000000000000000000000000000000..9ec8f76f5420d5fb5c64e1c13fbad7818886f748
GIT binary patch
literal 533
zcmZSM2o7-%(hV~(WMW`qU~Xq(&Shj{bu7wE%whTr5`sYHP$p(MMmF)B%(7J7;>zNZ
z)LezM%$(F>h2)IX<ZLDpHctPLc#u(^ZfyLX!Tt)t`K3k4sS3rZCHAZg3=DI3Ua|Q3
z*B)6J4@jA#r!QPh%ICWu76a9AL5&J_4P@g?%*jzG%1qBFVPkU-3UKvvK{kRnxUe*_
zI3ukXZU)dQhK7Fx%|Nz--?gYHzeqvXP9ZNJ<Q}+1FbiQck{2;8)({TgwH;_Nk|GQb
zz6snR*NWyiQMm2pMfrK@3dP`XgS!FQp;*EK<}_qwLU0p-{((dT+&GweD9y>j4-77r
T|Ns93<C%p4NU{89_|E_UdF_(|

literal 0
HcmV?d00001


From 002487c5d12ea6c1c0f1c639ebf52b11c810eb28 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 00:25:27 +0200
Subject: [PATCH 26/55] some name changes

---
 src/config.sample.cfg |  10 ++--
 src/func/check_config |  16 +++---
 src/remaster.sh       | 130 +++++++++++++++++++++---------------------
 3 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/config.sample.cfg b/src/config.sample.cfg
index b16bc57..21fd3e2 100644
--- a/src/config.sample.cfg
+++ b/src/config.sample.cfg
@@ -8,16 +8,16 @@
 modus_default="update_pxe"
 
 #CD/DVD
-#entweder iso_source oder filesystem_source alls quelle
+#entweder iso_source oder squashfs_path alls quelle
 # -> bei iso gen erforderlich!
 iso_source="/data/remaster/desinfect-2017.iso"
 #destination optinal
-iso_destination="/data/remaster/result/custom_desinfect_`date '+%Y-%m-%d'`.iso"
+iso_aim="/data/remaster/result/custom_desinfect_`date '+%Y-%m-%d'`.iso"
 iso_lable="DESINFECT_`date '+%Y-%m-%d'`"
 
 #Filesystem (for pxe)
-#entweder iso_source oder filesystem_source alls quelle
-filesystem_source="/data/remaster/result/filesystem.squashfs"
+#entweder iso_source oder squashfs_path alls quelle
+squashfs_path="/data/remaster/result/filesystem.squashfs"
 
 #Network
 proxy_host="proxy.local"
@@ -26,7 +26,7 @@ domain="local"
 nameserver="10.x.x.2,10.x.x.1"
 
 #remaster_script
-distro="desinfect2017"
+project="desinfect.17"
 
 #LOG
 log_file="/data/remaster/logs/`date '+%Y-%m-%d'`.log"
diff --git a/src/func/check_config b/src/func/check_config
index fcb70b0..313332a 100755
--- a/src/func/check_config
+++ b/src/func/check_config
@@ -6,21 +6,21 @@
 function check_config() {
 
     #Project
-    [ -f "<LIBDIR>/proj/$distro" ] || {
-        echo "No Project \"$distro\" is not supported"
+    [ -f "<LIBDIR>/proj/$project" ] || {
+        echo "No Project \"$project\" is not supported"
         return 3
     }
 
     #live-system files
     if [ -f "$iso_source" ]; then
-        if [ -n "$iso_destination" ] && [ -d "${iso_destination%/*}" ]; then
+        if [ -n "$iso_aim" ] && [ -d "${iso_aim%/*}" ]; then
             #Lable
-            [ -z "$iso_lable" ] && iso_lable="$distro"
+            [ -z "$iso_lable" ] && iso_lable="$project"
 
-            echo 'iso_source -> iso_destination'
+            echo 'iso_source -> iso_aim'
             echo 'iso_source -> squashfs [optinal]'
         else
-            if [ -n "$filesystem_source" ] && [ -d "${filesystem_source%/*}" ]; then
+            if [ -n "$squashfs_path" ] && [ -d "${squashfs_path%/*}" ]; then
                 echo 'iso_source -> squashfs'
             else
                 # ERROR
@@ -29,8 +29,8 @@ function check_config() {
             fi
         fi
     else
-        if [ -f "$filesystem_source" ]; then
-            if [ -n "$iso_destination" ]; then
+        if [ -f "$squashfs_path" ]; then
+            if [ -n "$iso_aim" ]; then
                 # ERROR
                 echo "only Squashfs source in Settings, cant creat ISO"
                 return 3
diff --git a/src/remaster.sh b/src/remaster.sh
index ddcd498..c3d1656 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -63,12 +63,12 @@ function main_renew() {
   echo "### S e t t i n g s ###" >> "$log_file"
   echo "#CD/DVD" >> "$log_file"
   echo "iso_source=\"$iso_source\"" >> "$log_file"
-  echo "iso_destination=\"$iso_destination\"" >> "$log_file"
+  echo "iso_aim=\"$iso_aim\"" >> "$log_file"
   echo "iso_lable=\"$iso_lable\"" >> "$log_file"
   echo >> "$log_file"
 
   echo "#Filesystem (for pxe)"  >> "$log_file"
-  echo "filesystem_source=\"$filesystem_source\""  >> "$log_file"
+  echo "squashfs_path=\"$squashfs_path\""  >> "$log_file"
   echo >> "$log_file"
 
   echo "#Network" >> "$log_file"
@@ -79,7 +79,7 @@ function main_renew() {
   echo >> "$log_file"
 
   echo "#remaster_script" >> "$log_file"
-  echo "distro=\"$distro\"" >> "$log_file"
+  echo "project=\"$project\"" >> "$log_file"
   echo >> "$log_file"
 
   echo "log_file=\"$log_file\""
@@ -111,7 +111,7 @@ function main_renew() {
 
   check_update >> "$log_file"
 
-  [ "$distro" != "" ] && distro="_$distro"
+  [ "$project" != "" ] && project="_$project"
 
   # 2. Entpacke ISO
   iso_extract "$iso_source" "$iso_extr_dir"
@@ -128,12 +128,12 @@ function main_renew() {
 
   # 4. Vorbereiten für chroot-Umgebung:
 
-  chroot_initial$distro "$chroot_path" >> "$log_file"
+  chroot_initial$project "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 5. Setzen der Netzwerk-Einstellungen:
   [ -n "$proxy_host" ] && {
-    proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
+    proxy_enable$project "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
   }
 
@@ -141,12 +141,12 @@ function main_renew() {
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 6. Updaten von Desinfec't:
-  os_update$distro "$chroot_path" >> "$log_file"
+  os_update$project "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 7. Installation optionaler Tools:
 
-  tools_add$distro "$chroot_path" "$tools_list" >> "$log_file"
+  tools_add$project "$chroot_path" "$tools_list" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   #addo ClamAV to conky_info
@@ -169,7 +169,7 @@ function main_renew() {
 
   # 9. Umount - Chroot Umgebung auflösen
 
-  chroot_umount$distro "$chroot_path" >> "$log_file"
+  chroot_umount$project "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   #Überprüfen ob alles ausgehängt wurde
@@ -186,23 +186,23 @@ function main_renew() {
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # wenn iso gewünscht
-  [ "$iso_destination" != "" ] && {
-    iso_create$distro "$chroot_path" "$iso_extr_dir" "$iso_destination" "$iso_lable" >> "$log_file"
+  [ "$iso_aim" != "" ] && {
+    iso_create$project "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
   }
 
   # wenn filesystem gewünscht
-  [ "$filesystem_source" != "" ] && {
+  [ "$squashfs_path" != "" ] && {
     #wen bereits forhanden dann löschen
-    [ -f "$filesystem_source" ] && rm "$filesystem_source"
-    cp "$filesystem_img" "$filesystem_source" >> "$log_file"
+    [ -f "$squashfs_path" ] && rm "$squashfs_path"
+    cp "$filesystem_img" "$squashfs_path" >> "$log_file"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-    chmod 666 "$filesystem_source"
+    chmod 666 "$squashfs_path"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
   }
 
-  chmod 666 "$iso_destination" "$filesystem_img" >> "$log_file"
+  chmod 666 "$iso_aim" "$filesystem_img" >> "$log_file"
 
   workspace_erase "$iso_extr_dir/" "$chroot_path/" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
@@ -226,7 +226,7 @@ function main_update_pxe() {
 
   echo "### S e t t i n g s ###" >> "$log_file"
   echo "#Filesystem (for pxe)"  >> "$log_file"
-  echo "filesystem_source=\"$filesystem_source\""
+  echo "squashfs_path=\"$squashfs_path\""
   echo >> "$log_file"
 
   echo "#Network" >> "$log_file"
@@ -235,7 +235,7 @@ function main_update_pxe() {
   echo >> "$log_file"
 
   echo "#remaster_script" >> "$log_file"
-  echo "distro=\"$distro\"" >> "$log_file"
+  echo "project=\"$project\"" >> "$log_file"
   echo >> "$log_file"
 
   echo "log_file=\"$log_file\""
@@ -266,20 +266,20 @@ function main_update_pxe() {
   check_config >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  [ "$distro" != "" ] && distro="_$distro"
+  [ "$project" != "" ] && project="_$project"
 
   # 1. Entpacken der Dateien des Live-Systems
-  [ -e "$filesystem_source" ] || {
-    echo "### ERROR ### \"$filesystem_source\" does not exist!" >> "$log_file"
+  [ -e "$squashfs_path" ] || {
+    echo "### ERROR ### \"$squashfs_path\" does not exist!" >> "$log_file"
     on_exit 15 >> "$log_file"
   }
 
-  filesystem_extract "$filesystem_source" "$chroot_path" >> "$log_file"
+  filesystem_extract "$squashfs_path" "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 2. Vorbereiten für chroot-Umgebung:
 
-  chroot_initial$distro "$chroot_path" >> "$log_file"
+  chroot_initial$project "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 3. Setzen der Netzwerk-Einstellungen:
@@ -288,7 +288,7 @@ function main_update_pxe() {
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 4. Updaten von Desinfec't:
-  os_update$distro "$chroot_path" >> "$log_file"
+  os_update$project "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 5. Manuelle Aktionen - deaktiviert
@@ -301,7 +301,7 @@ function main_update_pxe() {
 
   # 6. Umount - Chroot Umgebung auflösen
 
-  chroot_umount$distro "$chroot_path" >> "$log_file"
+  chroot_umount$project "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   #Überprüfen ob alles ausgehängt wurde
@@ -311,13 +311,13 @@ function main_update_pxe() {
   }
 
   # 5. Packen und Ersetzen der Dateien
-  rm "$filesystem_source" >> "$log_file"
+  rm "$squashfs_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  filesystem_pack "$chroot_path"  "$filesystem_source" >> "$log_file"
+  filesystem_pack "$chroot_path"  "$squashfs_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  chmod 777 "$filesystem_source" >> "$log_file"
+  chmod 777 "$squashfs_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   workspace_erase "$chroot_path/" >> "$log_file"
@@ -343,12 +343,12 @@ function main_update_iso() {
   echo "### S e t t i n g s ###" >> "$log_file"
   echo "#CD/DVD" >> "$log_file"
   echo "iso_source=\"$iso_source\"" >> "$log_file"
-  echo "iso_destination=\"$iso_destination\"" >> "$log_file"
+  echo "iso_aim=\"$iso_aim\"" >> "$log_file"
   echo "iso_lable=\"$iso_lable\"" >> "$log_file"
   echo >> "$log_file"
 
   echo "#Filesystem (for pxe)"  >> "$log_file"
-  echo "filesystem_source=\"$filesystem_source\""  >> "$log_file"
+  echo "squashfs_path=\"$squashfs_path\""  >> "$log_file"
   echo >> "$log_file"
 
   echo "#Network" >> "$log_file"
@@ -359,7 +359,7 @@ function main_update_iso() {
   echo >> "$log_file"
 
   echo "#remaster_script" >> "$log_file"
-  echo "distro=\"$distro\"" >> "$log_file"
+  echo "project=\"$project\"" >> "$log_file"
   echo >> "$log_file"
 
   echo "log_file=\"$log_file\""
@@ -391,7 +391,7 @@ function main_update_iso() {
   check_config >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  [ "$distro" != "" ] && distro="_$distro"
+  [ "$project" != "" ] && project="_$project"
 
   # 2. Entpacke ISO
   iso_extract "$iso_source" "$iso_extr_dir"
@@ -418,12 +418,12 @@ function main_update_iso() {
 
   # 4. Vorbereiten für chroot-Umgebung:
 
-  chroot_initial$distro "$chroot_path" >> "$log_file"
+  chroot_initial$project "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 5. Setzen der Netzwerk-Einstellungen:
   [ -n "$proxy_host" ] && {
-    proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
+    proxy_enable$project "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
   }
 
@@ -431,12 +431,12 @@ function main_update_iso() {
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 6. Updaten von Desinfec't:
-  os_update$distro "$chroot_path" >> "$log_file"
+  os_update$project "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 7. Installation optionaler Tools:
 
-  tools_add$distro "$chroot_path" "$tools_list" >> "$log_file"
+  tools_add$project "$chroot_path" "$tools_list" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   #addo ClamAV to conky_info
@@ -454,7 +454,7 @@ function main_update_iso() {
 
   # 9. Umount - Chroot Umgebung auflösen
 
-  chroot_umount$distro "$chroot_path" >> "$log_file"
+  chroot_umount$project "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   #Überprüfen ob alles ausgehängt wurde
@@ -471,23 +471,23 @@ function main_update_iso() {
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # wenn iso gewünscht
-  [ "$iso_destination" != "" ] && {
-    iso_create$distro "$chroot_path" "$iso_extr_dir" "$iso_destination" "$iso_lable" >> "$log_file"
+  [ "$iso_aim" != "" ] && {
+    iso_create$project "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
   }
 
   # wenn filesystem gewünscht
-  [ "$filesystem_source" != "" ] && {
+  [ "$squashfs_path" != "" ] && {
     #wen bereits forhanden dann löschen
-    [ -f "$filesystem_source" ] && rm "$filesystem_source"
-    cp "$filesystem_img" "$filesystem_source" >> "$log_file"
+    [ -f "$squashfs_path" ] && rm "$squashfs_path"
+    cp "$filesystem_img" "$squashfs_path" >> "$log_file"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-    chmod 666 "$filesystem_source"
+    chmod 666 "$squashfs_path"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
   }
 
-  chmod 666 "$iso_destination" "$filesystem_img" >> "$log_file"
+  chmod 666 "$iso_aim" "$filesystem_img" >> "$log_file"
 
   #11. End
   workspace_erase "$iso_extr_dir/" "$chroot_path/" >> "$log_file"
@@ -545,16 +545,16 @@ source <LIBDIR>/func/filesystem_get_type
 #iso_extract [iso_source] [iso_extr_dir]
 source <LIBDIR>/func/iso_extract
 
-#iso_create [chroot_path] [iso_extr_dir] [iso_destination] [iso_lable]
+#iso_create [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
 source <LIBDIR>/func/iso_create
 
-#iso_create_desinfect2015 [chroot_path] [iso_extr_dir] [iso_destination] [iso_lable]
+#iso_create_desinfect2015 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
 function iso_create_desinfect2015() {
   echo "prepere iso folder ... "
 
   chroot_path="$1"
   iso_extr_dir="$2"
-  iso_destination="$3"
+  iso_aim="$3"
   iso_lable="$4"
 
   #desinfect
@@ -563,16 +563,16 @@ function iso_create_desinfect2015() {
 
   echo "done"
 
-  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_destination" "$iso_lable"
+  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
 }
 
-#iso_create_desinfect2016 [chroot_path] [iso_extr_dir] [iso_destination] [iso_lable]
+#iso_create_desinfect2016 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
 function iso_create_desinfect2016() {
   #echo "prepere iso folder ... "
 
   chroot_path="$1"
   iso_extr_dir="$2"
-  iso_destination="$3"
+  iso_aim="$3"
   iso_lable="$4"
 
   #desinfect
@@ -581,19 +581,19 @@ function iso_create_desinfect2016() {
 
   #echo "done"
 
-  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_destination" "$iso_lable"
+  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
 }
 
-#iso_create_desinfect2017 [chroot_path] [iso_extr_dir] [iso_destination] [iso_lable]
-function iso_create_desinfect2017() {
+#iso_create_desinfect.17 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
+function iso_create_desinfect.17() {
   #echo "prepere iso folder ... "
 
   chroot_path="$1"
   iso_extr_dir="$2"
-  iso_destination="$3"
+  iso_aim="$3"
   iso_lable="$4"
 
-  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_destination" "$iso_lable"
+  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
 }
 
 ### chroot ###
@@ -645,8 +645,8 @@ function chroot_initial_desinfect2016() {
   echo "done"
 }
 
-#chroot_initial_desinfect2017 [chroot_dir]
-function chroot_initial_desinfect2017() {
+#chroot_initial_desinfect.17 [chroot_dir]
+function chroot_initial_desinfect.17() {
   #$1 = chroot dir
 
   chroot_initial "$1"
@@ -707,8 +707,8 @@ function chroot_umount_desinfect2016() {
   echo "done"
 }
 
-#chroot_umount_desinfect2017 [chroot_dir]
-function chroot_umount_desinfect2017() {
+#chroot_umount_desinfect.17 [chroot_dir]
+function chroot_umount_desinfect.17() {
   #call main mount
   chroot_umount "$1"
 }
@@ -835,8 +835,8 @@ function proxy_enable_desinfect2016() {
   echo "done"
 }
 
-#proxy_enable_desinfect2017 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable_desinfect2017() {
+#proxy_enable_desinfect.17 [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable_desinfect.17() {
 
   proxy_enable $1 $2 $3
 
@@ -1248,8 +1248,8 @@ function os_update_desinfect2016() {
   echo "update virus definitions done"
 }
 
-#os_update_desinfect2017 [chroot_dir]
-function os_update_desinfect2017() {
+#os_update_desinfect.17 [chroot_dir]
+function os_update_desinfect.17() {
   #$1 = chroot directory
 
   chroot_dir="$1"
@@ -1370,8 +1370,8 @@ function tools_add_desinfect2016() {
   sourcelist_desinfect_set_nomal2016 "$chroot_dir"
 }
 
-#tools_add_desinfect2017 [chroot_dir] [tools_list]
-function tools_add_desinfect2017() {
+#tools_add_desinfect.17 [chroot_dir] [tools_list]
+function tools_add_desinfect.17() {
   #$1 = chroot directory
   chroot_dir="$1"
   tools_list="$2"

From 6bc29a5011ea23755b699528b24e2a1ad4bcd009 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 00:46:33 +0200
Subject: [PATCH 27/55] remove tmp-fix

---
 src/proj/desinfect2017 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/proj/desinfect2017

diff --git a/src/proj/desinfect2017 b/src/proj/desinfect2017
deleted file mode 100644
index e69de29..0000000

From be32c02a813dcc8814dd563c909c7228383a7ab0 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 12:07:47 +0200
Subject: [PATCH 28/55] add some more messages to log

---
 src/remaster.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/remaster.sh b/src/remaster.sh
index c3d1656..20ac88c 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -84,7 +84,7 @@ function main_renew() {
 
   echo "log_file=\"$log_file\""
   echo "log_mail_aim=\"$log_mail_aim\""
-  echo "log_mail_subject=\"$log_mail_subject\""
+  echo "log_mail_subject=\"$log_mail_subj >> "$log_file"ect\""
   echo ""
 
   echo "#Sonstiges" >> "$log_file"
@@ -100,10 +100,10 @@ function main_renew() {
   echo $'### R U N ... ###\n' >> "$log_file"
 
   #1. Set and Check Enviroment
-  check_user
+  check_user >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  check_dependency
+  check_dependency >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   check_config >> "$log_file"
@@ -114,7 +114,7 @@ function main_renew() {
   [ "$project" != "" ] && project="_$project"
 
   # 2. Entpacke ISO
-  iso_extract "$iso_source" "$iso_extr_dir"
+  iso_extract "$iso_source" "$iso_extr_dir"  >> "$log_file"
 
   # 3. Entpacken der Dateien des Live-Systems
   filesystem_img="`find  "$iso_extr_dir" -name filesystem.squashfs`"
@@ -255,12 +255,12 @@ function main_update_pxe() {
   echo $'### R U N ... ###\n' >> "$log_file"
 
   #1. Set and Check Enviroment
-  check_user
+  check_user >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   check_update >> "$log_file"
 
-  check_dependency
+  check_dependency >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   check_config >> "$log_file"
@@ -380,12 +380,12 @@ function main_update_iso() {
   echo $'### R U N ... ###\n' >> "$log_file"
 
   #1. Set and Check Enviroment
-  check_user
+  check_user >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   check_update >> "$log_file"
 
-  check_dependency
+  check_dependency >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   check_config >> "$log_file"
@@ -394,7 +394,7 @@ function main_update_iso() {
   [ "$project" != "" ] && project="_$project"
 
   # 2. Entpacke ISO
-  iso_extract "$iso_source" "$iso_extr_dir"
+  iso_extract "$iso_source" "$iso_extr_dir"  >> "$log_file"
 
   # 3. Checke pxe version
   # if pxe is set

From 7c46700bd57f990ece58aee91343c7074e983851 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 12:34:55 +0200
Subject: [PATCH 29/55] init

---
 src/proj/desinfect.15 | 7 +++++++
 src/proj/desinfect.16 | 7 +++++++
 src/proj/desinfect.17 | 2 --
 src/proj/ubuntu.14.04 | 7 +++++++
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100755 src/proj/desinfect.15
 create mode 100755 src/proj/desinfect.16
 create mode 100755 src/proj/ubuntu.14.04

diff --git a/src/proj/desinfect.15 b/src/proj/desinfect.15
new file mode 100755
index 0000000..5ffec8c
--- /dev/null
+++ b/src/proj/desinfect.15
@@ -0,0 +1,7 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#desinfect.15
+# . -Y ubuntu.14.04 -> ubuntu -> debian
+source <LIBDIR>/proj/ubuntu.14.04
diff --git a/src/proj/desinfect.16 b/src/proj/desinfect.16
new file mode 100755
index 0000000..b4935c5
--- /dev/null
+++ b/src/proj/desinfect.16
@@ -0,0 +1,7 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#desinfect.16
+# . -Y ubuntu.14.04 -> ubuntu -> debian
+source <LIBDIR>/proj/ubuntu.14.04
diff --git a/src/proj/desinfect.17 b/src/proj/desinfect.17
index eedc2ce..d86cd6b 100755
--- a/src/proj/desinfect.17
+++ b/src/proj/desinfect.17
@@ -5,5 +5,3 @@
 #desinfect.17
 # . -Y ubuntu.16.04 -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu.16.04
-
-TEST2="na"
diff --git a/src/proj/ubuntu.14.04 b/src/proj/ubuntu.14.04
new file mode 100755
index 0000000..427a76a
--- /dev/null
+++ b/src/proj/ubuntu.14.04
@@ -0,0 +1,7 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#ubuntu.16.04
+# . -> ubuntu -> debian
+source <LIBDIR>/proj/ubuntu

From e32c217fea98786df197bbc5aabbbe73a327a582 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 12:42:10 +0200
Subject: [PATCH 30/55] generalize project file format

---
 src/proj/debian       | 2 +-
 src/proj/desinfect.15 | 1 +
 src/proj/desinfect.16 | 1 +
 src/proj/desinfect.17 | 1 +
 src/proj/ubuntu       | 1 +
 src/proj/ubuntu.14.04 | 3 ++-
 src/proj/ubuntu.16.04 | 1 +
 7 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/proj/debian b/src/proj/debian
index db0aaa4..e0e89ec 100755
--- a/src/proj/debian
+++ b/src/proj/debian
@@ -6,7 +6,7 @@
 ##### Base Template D E B I A N ####
 ####################################
 # .
-
+project_relation="debian"
 
 #tools_add [chroot_dir] [tools_list]
 function tools_add() {
diff --git a/src/proj/desinfect.15 b/src/proj/desinfect.15
index 5ffec8c..75d511f 100755
--- a/src/proj/desinfect.15
+++ b/src/proj/desinfect.15
@@ -5,3 +5,4 @@
 #desinfect.15
 # . -Y ubuntu.14.04 -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu.14.04
+project_relation="desinfect.15 $project_relation"
diff --git a/src/proj/desinfect.16 b/src/proj/desinfect.16
index b4935c5..c52d5ff 100755
--- a/src/proj/desinfect.16
+++ b/src/proj/desinfect.16
@@ -5,3 +5,4 @@
 #desinfect.16
 # . -Y ubuntu.14.04 -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu.14.04
+project_relation="desinfect.16 $project_relation"
diff --git a/src/proj/desinfect.17 b/src/proj/desinfect.17
index d86cd6b..b0596f3 100755
--- a/src/proj/desinfect.17
+++ b/src/proj/desinfect.17
@@ -5,3 +5,4 @@
 #desinfect.17
 # . -Y ubuntu.16.04 -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu.16.04
+project_relation="desinfect.17 $project_relation"
diff --git a/src/proj/ubuntu b/src/proj/ubuntu
index cd36ae9..8f00d9f 100755
--- a/src/proj/ubuntu
+++ b/src/proj/ubuntu
@@ -7,3 +7,4 @@
 ####################################
 # . -> debian
 source <LIBDIR>/proj/debian
+project_relation="ubuntu $project_relation"
diff --git a/src/proj/ubuntu.14.04 b/src/proj/ubuntu.14.04
index 427a76a..d535285 100755
--- a/src/proj/ubuntu.14.04
+++ b/src/proj/ubuntu.14.04
@@ -2,6 +2,7 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
-#ubuntu.16.04
+#ubuntu.14.04
 # . -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu
+project_relation="ubuntu.14.04 $project_relation"
diff --git a/src/proj/ubuntu.16.04 b/src/proj/ubuntu.16.04
index 427a76a..3143508 100755
--- a/src/proj/ubuntu.16.04
+++ b/src/proj/ubuntu.16.04
@@ -5,3 +5,4 @@
 #ubuntu.16.04
 # . -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu
+project_relation="ubuntu.16.04 $project_relation"

From 636aba43d5c7cdbb15a0a65bb7fbbfe39c884258 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 12:45:42 +0200
Subject: [PATCH 31/55] docu ...

---
 doc/proj-head | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100755 doc/proj-head

diff --git a/doc/proj-head b/doc/proj-head
new file mode 100755
index 0000000..2b70ea3
--- /dev/null
+++ b/doc/proj-head
@@ -0,0 +1,8 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#<PROJECT_NAME>
+# . -> <PROJECT_PARENT> -> <PROJECT_BASE>
+source <LIBDIR>/proj/<PROJECT_PARENT>
+project_relation="<PROJECT_NAME> $project_relation"

From 0ffbae48a7a44275edc78b222020d1e030089e3e Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 13:04:37 +0200
Subject: [PATCH 32/55] =?UTF-8?q?das=20gro=C3=9Fe=20wandern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/proj/debian       |  53 +++
 src/proj/desinfect.15 | 213 +++++++++++
 src/proj/desinfect.16 | 268 ++++++++++++++
 src/proj/desinfect.17 | 267 ++++++++++++++
 src/remaster.sh       | 815 ------------------------------------------
 5 files changed, 801 insertions(+), 815 deletions(-)

diff --git a/src/proj/debian b/src/proj/debian
index e0e89ec..3ac9a45 100755
--- a/src/proj/debian
+++ b/src/proj/debian
@@ -35,3 +35,56 @@ function os_update() {
 
 	echo "done"
 }
+
+#proxy_enable [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable() {
+  echo -n "enable proxy ... "
+
+  chroot_dir="$1"
+  proxy_host="$2"
+  proxy_port="$3"
+
+  [ -d "$chroot_dir" ] || {
+    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
+    return 12
+  }
+
+  #Wenn alle zwei Parameter gegeben
+  if [ "$proxy_host" != "" ] && [ "$proxy_port" != "" ] ; then
+    echo "http_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+    echo "https_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+    echo "ftp_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+
+    echo "HTTP_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+    echo "HTTPS_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+    echo "FTP_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
+
+    echo "Acquire::http::Proxy  \"http://$proxy_host:$proxy_port\"\;" > $chroot_dir/etc/apt/apt.conf.d/90proxy
+    echo "Acquire::ftp::Proxy \"ftp://$proxy_host:$proxy_port\"\;" >> $chroot_dir/etc/apt/apt.conf.d/90proxy
+
+    echo "done"
+  else
+    if [ "$proxy_host" == "" ] && [ "$proxy_port" == "" ] ; then
+      echo "done"
+    else
+      echo "### ERROR ### proxy_enable: wrong parameters! (\"$chroot_dir\"; \"$proxy_host\"; \"$proxy_port\")"
+      echo "proxy_enable [chroot_dir] [proxy_host] [proxy_port]"
+      return 2
+    fi
+  fi
+}
+
+#dns_set [chroot_dir] [domain] [nameserver]
+function dns_set() {
+  echo -n "set dns config ... "
+
+  rm "$chroot_dir/etc/resolv.conf"
+
+  [ "$2" != "" ] && echo "domain $2" >> "$chroot_dir/etc/resolv.conf"
+  echo "search $2" >> "$chroot_dir/etc/resolv.conf"
+  for namesv in `echo "$3" | tr "," " "`; do
+    echo "nameserver $namesv" >> "$chroot_dir/etc/resolv.conf"
+  done
+
+  echo "done"
+}
diff --git a/src/proj/desinfect.15 b/src/proj/desinfect.15
index 75d511f..7639578 100755
--- a/src/proj/desinfect.15
+++ b/src/proj/desinfect.15
@@ -6,3 +6,216 @@
 # . -Y ubuntu.14.04 -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu.14.04
 project_relation="desinfect.15 $project_relation"
+
+
+
+#iso_create_desinfect2015 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
+function iso_create_desinfect2015() {
+  echo "prepere iso folder ... "
+
+  chroot_path="$1"
+  iso_extr_dir="$2"
+  iso_aim="$3"
+  iso_lable="$4"
+
+  #desinfect
+  rm "$iso_extr_dir/casper/initrd.lz"
+  wget http://www.heise.de/ct/projekte/desinfect/des15/initrd.lz -O "$iso_extr_dir/casper/initrd.lz"
+
+  echo "done"
+
+  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
+}
+
+#chroot_initial_desinfect2015 [chroot_dir]
+function chroot_initial_desinfect2015() {
+  #$1 = chroot dir
+
+  chroot_initial "$1"
+
+  echo -n "initial desinfect on chroot ... "
+
+  #check chroot dir
+  chroot_dir="$1"
+  [ -d "$chroot_dir" ] || {
+    echo "### ERROR ### chroot_initial_desinfect: chroot directory not exist!"
+    return 12
+  }
+
+  #mount virus definitions
+  #bitdefender
+  mount --bind $chroot_dir/opt/BitDefender-scanner/var/lib/scan{.orig,}
+  mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
+
+  echo "done"
+}
+
+#chroot_umount_desinfect2015 [chroot_dir]
+function chroot_umount_desinfect2015() {
+  #call main mount
+  chroot_umount "$1"
+
+  echo -n "unmount desinfect on chroot ... "
+  #check chroot dir
+  chroot_dir="$1"
+  [ -d "$chroot_dir" ] || {
+    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
+    return 12
+  }
+
+  for d in "$chroot_dir/opt/BitDefender-scanner/var/lib/scan" "$chroot_dir/var/kl/bases_rd" ; do
+    umount $d
+    retval=$?
+    [ "$retval" -gt 0 ] && {
+      echo "### ERROR ### chroot_umount_desinfect: can't umount \"$d\"!"
+      return 21
+    }
+  done
+
+  echo "done"
+}
+
+#proxy_enable_desinfect2015 [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable_desinfect2015() {
+
+  proxy_enable $1 $2 $3
+
+  echo -n "enable proxy for desinfect's av ... "
+
+  chroot_dir="$1"
+  proxy_host="$2"
+  proxy_port="$3"
+
+  #Avast AntiVirus
+  sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
+  sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
+
+  #BitDefender
+  echo "ProxyEnable = Yes" >> "$chroot_dir/etc/BitDefender-scanner/bdscan.conf"
+  echo "ProxyHost = $proxy_host:$proxy_port" >> "$chroot_dir/etc/BitDefender-scanner/bdscan.conf"
+
+  #Clam AV
+  echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
+  echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
+
+  #Kaspersky
+  sed -i "s/<tDWORD name=\"UseProxy\">0<\/tDWORD>/<tDWORD name=\"UseProxy\">1<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
+  sed -i "s/<tSTRING name=\"ProxyHost\"><\/tSTRING>/<tSTRING name=\"ProxyHost\">$proxy_host<\/tSTRING>/g" "$chroot_dir/etc/kl/config.xml"
+  sed -i "s/<tDWORD name=\"ProxyPort\"><\/tDWORD>/<tDWORD name=\"ProxyPort\">$proxy_port<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
+
+  echo "done"
+}
+
+#sourcelist_desinfect_set_nomal2015 [chroot_dir]
+function sourcelist_desinfect_set_nomal2015() {
+  echo -n "build normal source.list ... "
+  #$1 = chroot directory
+
+  sourcelist="$1/etc/apt/sources.list"
+
+
+  echo "#### Desinfe't 2015 ####" > "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2015 main" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "# #### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
+  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
+  echo "# deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
+
+  echo "done"
+}
+
+#sourcelist_desinfect_set_extendet2015 [chroot_dir]
+function sourcelist_desinfect_set_extendet2015() {
+  echo -n "build extendet source.list ... "
+
+  sourcelist="$1/etc/apt/sources.list"
+
+
+  echo "#### Desinfe't 2015 ####" > "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2015 main" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "#### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
+  echo "## developers who want to ship their latest software." >> "$sourcelist"
+  echo "deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
+
+  echo "done"
+}
+
+#os_update_desinfect2015 [chroot_dir]
+function os_update_desinfect2015() {
+  #$1 = chroot directory
+
+  chroot_dir="$1"
+
+  #call main os_update
+  os_update "$chroot_dir"
+
+  echo "update virus definitions ... "
+
+  #BitDefender
+  chroot "$chroot_dir" /bin/bash -c "bdscan --update" | grep -v "... updated"
+
+  #Avast Avira
+  chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
+
+  #Clam AV
+  chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
+  rm -f "$chroot_dir/var/lib/clamav/daily.cld"
+
+  #Karspersky
+  echo '#!/bin/bash' > "$chroot_dir/tmp/up_kasp"
+  echo 'PATH=/usr/lib/kl:$PATH' >> "$chroot_dir/tmp/up_kasp"
+  echo 'LD_LIBRARY_PATH=/usr/lib/kl:$LD_LIBRARY_PATH' >> "$chroot_dir/tmp/up_kasp"
+  echo 'KL_PLUGINS_PATH=/usr/lib/kl' >> "$chroot_dir/tmp/up_kasp"
+  echo 'export PATH LD_LIBRARY_PATH KL_PLUGINS_PATH' >> "$chroot_dir/tmp/up_kasp"
+  echo '/usr/lib/kl/kav update' >> "$chroot_dir/tmp/up_kasp"
+  chmod +x  "$chroot_dir/tmp/up_kasp"
+  chroot "$chroot_dir" /bin/bash -c "/tmp/up_kasp" | grep -v ".kdc" | grep -v "File downloaded"
+  rm "$chroot_dir/tmp/up_kasp"
+
+
+  echo "done"
+}
+
+#tools_add_desinfect2015 [chroot_dir] [tools_list]
+function tools_add_desinfect2015() {
+  #$1 = chroot directory
+  chroot_dir="$1"
+  tools_list="$2"
+
+  sourcelist_desinfect_set_extendet2015 "$chroot_dir"
+  tools_add "$chroot_dir" "$tools_list"
+  sourcelist_desinfect_set_nomal2015 "$chroot_dir"
+}
diff --git a/src/proj/desinfect.16 b/src/proj/desinfect.16
index c52d5ff..9c8246d 100755
--- a/src/proj/desinfect.16
+++ b/src/proj/desinfect.16
@@ -6,3 +6,271 @@
 # . -Y ubuntu.14.04 -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu.14.04
 project_relation="desinfect.16 $project_relation"
+
+
+
+#iso_create_desinfect2016 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
+function iso_create_desinfect2016() {
+  #echo "prepere iso folder ... "
+
+  chroot_path="$1"
+  iso_extr_dir="$2"
+  iso_aim="$3"
+  iso_lable="$4"
+
+  #desinfect
+  #rm "$iso_extr_dir/casper/initrd.lz"
+  #wget http://www.heise.de/ct/projekte/desinfect/des15/initrd.lz -O "$iso_extr_dir/casper/initrd.lz"
+
+  #echo "done"
+
+  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
+}
+
+#chroot_initial_desinfect2016 [chroot_dir]
+function chroot_initial_desinfect2016() {
+  #$1 = chroot dir
+
+  chroot_initial "$1"
+
+  echo -n "initial desinfect on chroot ... "
+
+  #check chroot dir
+  chroot_dir="$1"
+  [ -d "$chroot_dir" ] || {
+    echo "### ERROR ### chroot_initial_desinfect: chroot directory not exist!"
+    return 12
+  }
+
+  #mount virus definitions
+  mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
+
+  echo "done"
+}
+
+#chroot_umount_desinfect2016 [chroot_dir]
+function chroot_umount_desinfect2016() {
+  #call main mount
+  chroot_umount "$1"
+
+  echo -n "unmount desinfect on chroot ... "
+  #check chroot dir
+  chroot_dir="$1"
+  [ -d "$chroot_dir" ] || {
+    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
+    return 12
+  }
+
+  umount "$chroot_dir/var/kl/bases_rd"
+  [ "$?" -gt 0 ] && {
+    echo "### ERROR ### chroot_umount_desinfect: can't umount \"$chroot_dir/var/kl/bases_rd\"!"
+    #return 21
+  }
+
+  echo "done"
+}
+
+#proxy_enable_desinfect2016 [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable_desinfect2016() {
+
+  proxy_enable $1 $2 $3
+
+  echo -n "enable proxy for desinfect's av ... "
+
+  chroot_dir="$1"
+  proxy_host="$2"
+  proxy_port="$3"
+  tmp_file_344532="`mktemp`"
+
+  #Avast AntiVirus
+  sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
+  sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
+
+  #Clam AV
+  cat "$chroot_dir/etc/clamav/freshclam.conf" | grep -v "HTTPProxyServer" | grep -v "HTTPProxyPort" > "$tmp_file_344532"
+  rm "$chroot_dir/etc/clamav/freshclam.conf"
+  cp "$tmp_file_344532" "$chroot_dir/etc/clamav/freshclam.conf"
+
+  echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
+  echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
+
+  #Eset AV
+  cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "proxy_addr" | grep -v "proxy_port" > "$tmp_file_344532"
+  rm "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+  cp "$tmp_file_344532" "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+
+  echo "proxy_addr = \"$proxy_host\"" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+  echo "proxy_port = $proxy_port" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+
+  #Kaspersky
+  sed -i "s/<tDWORD name=\"UseProxy\">0<\/tDWORD>/<tDWORD name=\"UseProxy\">1<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
+  sed -i "s/<tSTRING name=\"ProxyHost\"><\/tSTRING>/<tSTRING name=\"ProxyHost\">$proxy_host<\/tSTRING>/g" "$chroot_dir/etc/kl/config.xml"
+  sed -i "s/<tDWORD name=\"ProxyPort\"><\/tDWORD>/<tDWORD name=\"ProxyPort\">$proxy_port<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
+
+  rm "$tmp_file_344532"
+  tmp_file_344532=
+
+  echo "done"
+}
+
+#sourcelist_desinfect_set_nomal2016 [chroot_dir]
+function sourcelist_desinfect_set_nomal2016() {
+  echo -n "build normal source.list ... "
+  #$1 = chroot directory
+
+  sourcelist="$1/etc/apt/sources.list"
+
+
+  echo "#### Desinfe't 2016 ####" > "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2016 main" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "# #### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
+  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
+  echo "# deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
+
+  echo "done"
+}
+
+#sourcelist_desinfect_set_extendet2016 [chroot_dir]
+function sourcelist_desinfect_set_extendet2016() {
+  echo -n "build extendet source.list ... "
+
+  sourcelist="$1/etc/apt/sources.list"
+
+
+  echo "#### Desinfe't 2016 ####" > "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2016 main" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "#### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
+  echo "## developers who want to ship their latest software." >> "$sourcelist"
+  echo "deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
+
+  echo "done"
+}
+
+#os_update_desinfect2016 [chroot_dir]
+function os_update_desinfect2016() {
+  #$1 = chroot directory
+
+  chroot_dir="$1"
+
+  #call main os_update
+  os_update "$chroot_dir"
+
+  echo "update virus definitions ... "
+
+  #Avast Avira
+  {
+    echo "Avira ..."
+    chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
+    echo "Avira done"
+  }
+
+  #Clam AV
+  {
+    echo "ClamAV..."
+    chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
+    rm -f "$chroot_dir/var/lib/clamav/daily.cld"
+    echo "ClamAV done"
+  }
+
+  #Eset AV
+  {
+    echo "Eset AV ..."
+    tmp_file_23421="`mktemp`"
+    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "av_update_username" | grep -v "av_update_password" > "$tmp_file_23421"
+    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+    chroot "$chroot_dir" /bin/bash -c "/usr/bin/esetrand" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+
+    echo "set timeout: 2min"
+    av_eaet_timeout=1200
+    tmp_var_3092="`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`"
+
+    #eig. update routine
+    chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets restart"
+    sleep 2
+    chroot "$chroot_dir" /bin/bash -c "/opt/eset/esets/sbin/esets_daemon --update"
+
+    #warten auf daemon update ...
+    sleep 10m
+    echo "wait 10min for Eset AV update"
+    while [ "`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`" == "$tmp_var_3092" ]; do
+      sleep 1
+      av_eaet_timeout=$((av_eaet_timeout-1))
+      [ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
+    done
+
+    sleep 4
+
+    chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
+
+    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+
+    rm "$tmp_file_23421"
+    tmp_file_23421=
+    tmp_var_3092=
+    echo "Eset AV done"
+  }
+
+  #Karspersky
+  {
+    echo "Karspersky ..."
+    #gen update-scrypt
+    echo '#!/bin/bash' > "$chroot_dir/tmp/up_kasp"
+    echo 'PATH=/usr/lib/kl:$PATH' >> "$chroot_dir/tmp/up_kasp"
+    echo 'LD_LIBRARY_PATH=/usr/lib/kl:$LD_LIBRARY_PATH' >> "$chroot_dir/tmp/up_kasp"
+    echo 'KL_PLUGINS_PATH=/usr/lib/kl' >> "$chroot_dir/tmp/up_kasp"
+    echo 'export PATH LD_LIBRARY_PATH KL_PLUGINS_PATH' >> "$chroot_dir/tmp/up_kasp"
+    echo '/usr/lib/kl/kav update' >> "$chroot_dir/tmp/up_kasp"
+    chmod +x  "$chroot_dir/tmp/up_kasp"
+
+    chroot "$chroot_dir" /bin/bash -c "/tmp/up_kasp" | grep -v ".kdc" | grep -v "File downloaded"
+    rm "$chroot_dir/tmp/up_kasp"
+    echo "Karspersky done"
+  }
+
+  echo "update virus definitions done"
+}
+
+#tools_add_desinfect2016 [chroot_dir] [tools_list]
+function tools_add_desinfect2016() {
+  #$1 = chroot directory
+  chroot_dir="$1"
+  tools_list="$2"
+
+  sourcelist_desinfect_set_extendet2016 "$chroot_dir"
+  tools_add "$chroot_dir" "$tools_list"
+  sourcelist_desinfect_set_nomal2016 "$chroot_dir"
+}
diff --git a/src/proj/desinfect.17 b/src/proj/desinfect.17
index b0596f3..6f6d334 100755
--- a/src/proj/desinfect.17
+++ b/src/proj/desinfect.17
@@ -6,3 +6,270 @@
 # . -Y ubuntu.16.04 -> ubuntu -> debian
 source <LIBDIR>/proj/ubuntu.16.04
 project_relation="desinfect.17 $project_relation"
+
+
+#sourcelist_desinfect_set_nomal2017 [chroot_dir]
+function sourcelist_desinfect_set_nomal2017() {
+  echo -n "build normal source.list ... "
+  #$1 = chroot directory
+
+  sourcelist="$1/etc/apt/sources.list"
+
+
+  echo "#### Desinfe't 2017 ####" > "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2017 main" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "# #### Ubuntu 16.04 LTS (Xenial) ####" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
+  echo "# deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
+  echo "#" >> "$sourcelist"
+  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
+  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
+  echo "# deb http://extras.ubuntu.com/ubuntu xenial main" >> "$sourcelist"
+
+  echo "done"
+}
+
+#sourcelist_desinfect_set_extendet2017 [chroot_dir]
+function sourcelist_desinfect_set_extendet2017() {
+  echo -n "build extendet source.list ... "
+
+  sourcelist="$1/etc/apt/sources.list"
+
+
+  echo "#### Desinfe't 2017 ####" > "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2017 main" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "#### Ubuntu 16.04 LTS (Xenial) ####" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
+  echo "deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
+  echo "" >> "$sourcelist"
+  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
+  echo "## developers who want to ship their latest software." >> "$sourcelist"
+  echo "deb http://extras.ubuntu.com/ubuntu xenial main" >> "$sourcelist"
+
+  echo "done"
+}
+
+#os_update_desinfect.17 [chroot_dir]
+function os_update_desinfect.17() {
+  #$1 = chroot directory
+
+  chroot_dir="$1"
+
+  #call main os_update
+  os_update "$chroot_dir"
+
+  echo "update virus definitions ... "
+
+  #Avast Avira
+  {
+    echo "Avira ..."
+    #chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; /AntiVirUpdate/avupdate" | grep -v " -> "
+    chroot_sh "$chroot_dir" "/AntiVirUpdate/avupdate" | grep -v " -> "
+    echo "Avira done"
+  }
+
+  #Clam AV
+  {
+    echo "ClamAV..."
+    #chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; freshclam" > /dev/null
+    chroot_sh "$chroot_dir" "freshclam" > /dev/null
+    rm -f "$chroot_dir/var/lib/clamav/daily.cld"
+    echo "ClamAV done"
+  }
+
+  #Eset AV
+  {
+    echo "Eset AV ..."
+    tmp_file_23421="`mktemp`"
+    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "av_update_username" | grep -v "av_update_password" > "$tmp_file_23421"
+    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+    chroot "$chroot_dir" /bin/bash -c "/usr/bin/esetrand" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+
+    av_eaet_timeout=300
+    echo "set timeout: $((av_eaet_timeout/60))min"
+    tmp_var_3092="`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`"
+
+    #eig. update routine
+    #chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets restart"
+    chroot_sh "$chroot_dir" "/etc/init.d/esets restart"
+    sleep 2
+    #chroot "$chroot_dir" /bin/bash --login -c "/opt/eset/esets/sbin/esets_daemon --update"
+    chroot_sh "$chroot_dir" "/opt/eset/esets/sbin/esets_daemon --update"
+
+    #warten auf daemon update ...
+    echo "wait $((av_eaet_timeout/60))min for Eset AV update"
+    while [ "`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`" == "$tmp_var_3092" ]; do
+      sleep 10
+      av_eaet_timeout=$((av_eaet_timeout-10))
+      [ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
+    done
+
+    sleep 4
+
+    #chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
+    chroot_sh "$chroot_dir" "/etc/init.d/esets stop"
+
+    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+
+    rm "$tmp_file_23421"
+    tmp_file_23421=
+    tmp_var_3092=
+    echo "Eset AV done"
+  }
+
+  #Sophos
+  {
+    echo "Sophos..."
+    #chroot "$chroot_dir" /bin/bash --login -c "/opt/sophos-av/bin/savupdate -v3"
+    chroot_sh "$chroot_dir" "/opt/sophos-av/bin/savupdate -v3"
+    chroot_sh "$chroot_dir" "/opt/sophos-av/bin/savdstatus --version"
+    #chroot "$chroot_dir" /bin/bash -c "/opt/sophos-av/bin/savupdate -v3 -a"
+    echo "Sophos done"
+  }
+
+  #F-Secure
+  {
+    echo "F-Secure..."
+    chroot_sh "$chroot_dir" "/etc/init.d/fsaua start"
+    chroot_sh "$chroot_dir" "/etc/init.d/fsupdate stop"
+    ( sleep 1m; chroot_sh "$chroot_dir" "/etc/init.d/fsaua start" ) &
+    chroot_sh "$chroot_dir" "/opt/f-secure/fssp/bin/dbupdate_lite" && echo "Update Success"
+    sleep 1m
+    chroot_sh "$chroot_dir" "/etc/init.d/fsaua stop"
+    chroot_sh "$chroot_dir" "/etc/init.d/fsupdate stop"
+    echo "F-Secure done"
+  }
+
+  echo "update virus definitions done"
+}
+
+#iso_create_desinfect.17 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
+function iso_create_desinfect.17() {
+  #echo "prepere iso folder ... "
+
+  chroot_path="$1"
+  iso_extr_dir="$2"
+  iso_aim="$3"
+  iso_lable="$4"
+
+  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
+}
+
+#chroot_initial_desinfect.17 [chroot_dir]
+function chroot_initial_desinfect.17() {
+  #$1 = chroot dir
+
+  chroot_initial "$1"
+
+}
+
+#chroot_umount_desinfect.17 [chroot_dir]
+function chroot_umount_desinfect.17() {
+  #call main mount
+  chroot_umount "$1"
+}
+
+#proxy_enable_desinfect.17 [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable_desinfect.17() {
+
+  proxy_enable $1 $2 $3
+
+  echo "enable proxy for desinfect's av ... "
+
+  chroot_dir="$1"
+  proxy_host="$2"
+  proxy_port="$3"
+  tmp_file_344532="`mktemp`"
+
+  #Avast AntiVirus
+  if [ -f "$chroot_dir/AntiVirUpdate/avupdate" ]; then
+    echo "Avast AntiVirus: Found"
+    sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
+    sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
+  else
+    eco "Avast AntiVirus: NOT Found"
+  fi
+
+  #Eset AV
+  if [ -f "$chroot_dir/etc/opt/eset/esets/esets.cfg" ]; then
+    echo "Eset AV: Found"
+    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "proxy_addr" | grep -v "proxy_port" > "$tmp_file_344532"
+    rm "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+    cp "$tmp_file_344532" "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+
+    echo "proxy_addr = \"$proxy_host\"" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+    echo "proxy_port = $proxy_port" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
+  else
+    eco "Eset AV: NOT Found"
+  fi
+
+  #ClamAV
+  if [ -f "$chroot_dir/etc/clamav/freshclam.conf" ]; then
+    echo "ClamAV: Found"
+    cat "$chroot_dir/etc/clamav/freshclam.conf" | grep -v "HTTPProxyServer" | grep -v "HTTPProxyPort" > "$tmp_file_344532"
+    rm "$chroot_dir/etc/clamav/freshclam.conf"
+    cp "$tmp_file_344532" "$chroot_dir/etc/clamav/freshclam.conf"
+
+    echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
+    echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
+  else
+    eco "ClamAV: NOT Found"
+  fi
+
+  #Sophos
+  if [ -f ""$chroot_dir/opt/sophos-av/etc/savd.cfg"" ]; then
+    echo "Sophos: Found"
+    echo "<Source>sophos:</Source><Proxy><Address>http://$proxy_host:$proxy_port</Proxy></Address>" >> "$chroot_dir/opt/sophos-av/etc/savd.cfg"
+  else
+    eco "Sophos: NOT Found"
+  fi
+
+  #F-Secure
+  if [ -f "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" ]; then
+    echo "F-Secure: Found"
+    echo "enable_fsma=no" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+    echo "update_servers=http://fsbwserver-direct.f-secure.com" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+    echo "update_proxies=http://$proxy_host:$proxy_port" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+    echo "http_proxies=http://$proxy_host:$proxy_port" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
+    cat "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" > "$chroot_dir/etc/opt/f-secure/fsaua/fsaua_config"
+  else
+    eco "F-Secure: NOT Found"
+  fi
+
+
+  rm "$tmp_file_344532"
+  tmp_file_344532=
+
+  echo "done"
+}
+
+#tools_add_desinfect.17 [chroot_dir] [tools_list]
+function tools_add_desinfect.17() {
+  #$1 = chroot directory
+  chroot_dir="$1"
+  tools_list="$2"
+
+  sourcelist_desinfect_set_extendet2017 "$chroot_dir"
+  tools_add "$chroot_dir" "$tools_list"
+  sourcelist_desinfect_set_nomal2017 "$chroot_dir"
+}
diff --git a/src/remaster.sh b/src/remaster.sh
index 20ac88c..d6060d2 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -548,171 +548,17 @@ source <LIBDIR>/func/iso_extract
 #iso_create [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
 source <LIBDIR>/func/iso_create
 
-#iso_create_desinfect2015 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
-function iso_create_desinfect2015() {
-  echo "prepere iso folder ... "
-
-  chroot_path="$1"
-  iso_extr_dir="$2"
-  iso_aim="$3"
-  iso_lable="$4"
-
-  #desinfect
-  rm "$iso_extr_dir/casper/initrd.lz"
-  wget http://www.heise.de/ct/projekte/desinfect/des15/initrd.lz -O "$iso_extr_dir/casper/initrd.lz"
-
-  echo "done"
-
-  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
-}
-
-#iso_create_desinfect2016 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
-function iso_create_desinfect2016() {
-  #echo "prepere iso folder ... "
-
-  chroot_path="$1"
-  iso_extr_dir="$2"
-  iso_aim="$3"
-  iso_lable="$4"
-
-  #desinfect
-  #rm "$iso_extr_dir/casper/initrd.lz"
-  #wget http://www.heise.de/ct/projekte/desinfect/des15/initrd.lz -O "$iso_extr_dir/casper/initrd.lz"
-
-  #echo "done"
-
-  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
-}
-
-#iso_create_desinfect.17 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
-function iso_create_desinfect.17() {
-  #echo "prepere iso folder ... "
-
-  chroot_path="$1"
-  iso_extr_dir="$2"
-  iso_aim="$3"
-  iso_lable="$4"
-
-  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
-}
-
 ### chroot ###
 
 #chroot_initial [chroot_dir]
 source <LIBDIR>/func/chroot_initial
 
-#chroot_initial_desinfect2015 [chroot_dir]
-function chroot_initial_desinfect2015() {
-  #$1 = chroot dir
-
-  chroot_initial "$1"
-
-  echo -n "initial desinfect on chroot ... "
-
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_initial_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  #mount virus definitions
-  #bitdefender
-  mount --bind $chroot_dir/opt/BitDefender-scanner/var/lib/scan{.orig,}
-  mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
-
-  echo "done"
-}
-
-#chroot_initial_desinfect2016 [chroot_dir]
-function chroot_initial_desinfect2016() {
-  #$1 = chroot dir
-
-  chroot_initial "$1"
-
-  echo -n "initial desinfect on chroot ... "
-
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_initial_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  #mount virus definitions
-  mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
-
-  echo "done"
-}
-
-#chroot_initial_desinfect.17 [chroot_dir]
-function chroot_initial_desinfect.17() {
-  #$1 = chroot dir
-
-  chroot_initial "$1"
-
-}
-
-
 #chroot_clean [chroot_dir]
 source <LIBDIR>/func/chroot_clean
 
 #chroot_umount [chroot_dir]
 source <LIBDIR>/func/chroot_umount
 
-#chroot_umount_desinfect2015 [chroot_dir]
-function chroot_umount_desinfect2015() {
-  #call main mount
-  chroot_umount "$1"
-
-  echo -n "unmount desinfect on chroot ... "
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  for d in "$chroot_dir/opt/BitDefender-scanner/var/lib/scan" "$chroot_dir/var/kl/bases_rd" ; do
-    umount $d
-    retval=$?
-    [ "$retval" -gt 0 ] && {
-      echo "### ERROR ### chroot_umount_desinfect: can't umount \"$d\"!"
-      return 21
-    }
-  done
-
-  echo "done"
-}
-
-#chroot_umount_desinfect2016 [chroot_dir]
-function chroot_umount_desinfect2016() {
-  #call main mount
-  chroot_umount "$1"
-
-  echo -n "unmount desinfect on chroot ... "
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  umount "$chroot_dir/var/kl/bases_rd"
-  [ "$?" -gt 0 ] && {
-    echo "### ERROR ### chroot_umount_desinfect: can't umount \"$chroot_dir/var/kl/bases_rd\"!"
-    #return 21
-  }
-
-  echo "done"
-}
-
-#chroot_umount_desinfect.17 [chroot_dir]
-function chroot_umount_desinfect.17() {
-  #call main mount
-  chroot_umount "$1"
-}
-
 #chroot_is_mounted [chroot_dir]
 #(Boolean)-> true | false
 source <LIBDIR>/func/chroot_is_mounted
@@ -720,667 +566,6 @@ source <LIBDIR>/func/chroot_is_mounted
 #chroot_sh [chroot_dir] [command]
 source <LIBDIR>/func/chroot_sh
 
-### Settings ###
-### proxy
-
-#proxy_enable [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable() {
-  echo -n "enable proxy ... "
-
-  chroot_dir="$1"
-  proxy_host="$2"
-  proxy_port="$3"
-
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  #Wenn alle zwei Parameter gegeben
-  if [ "$proxy_host" != "" ] && [ "$proxy_port" != "" ] ; then
-    echo "http_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
-    echo "https_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
-    echo "ftp_proxy=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
-
-    echo "HTTP_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
-    echo "HTTPS_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
-    echo "FTP_PROXY=\"http://$proxy_host:$proxy_port\"" >> $chroot_dir/etc/environment
-
-    echo "Acquire::http::Proxy  \"http://$proxy_host:$proxy_port\"\;" > $chroot_dir/etc/apt/apt.conf.d/90proxy
-    echo "Acquire::ftp::Proxy \"ftp://$proxy_host:$proxy_port\"\;" >> $chroot_dir/etc/apt/apt.conf.d/90proxy
-
-    echo "done"
-  else
-    if [ "$proxy_host" == "" ] && [ "$proxy_port" == "" ] ; then
-      echo "done"
-    else
-      echo "### ERROR ### proxy_enable: wrong parameters! (\"$chroot_dir\"; \"$proxy_host\"; \"$proxy_port\")"
-      echo "proxy_enable [chroot_dir] [proxy_host] [proxy_port]"
-      return 2
-    fi
-  fi
-}
-
-#proxy_enable_desinfect2015 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable_desinfect2015() {
-
-  proxy_enable $1 $2 $3
-
-  echo -n "enable proxy for desinfect's av ... "
-
-  chroot_dir="$1"
-  proxy_host="$2"
-  proxy_port="$3"
-
-  #Avast AntiVirus
-  sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-  sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-
-  #BitDefender
-  echo "ProxyEnable = Yes" >> "$chroot_dir/etc/BitDefender-scanner/bdscan.conf"
-  echo "ProxyHost = $proxy_host:$proxy_port" >> "$chroot_dir/etc/BitDefender-scanner/bdscan.conf"
-
-  #Clam AV
-  echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
-  echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
-
-  #Kaspersky
-  sed -i "s/<tDWORD name=\"UseProxy\">0<\/tDWORD>/<tDWORD name=\"UseProxy\">1<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tSTRING name=\"ProxyHost\"><\/tSTRING>/<tSTRING name=\"ProxyHost\">$proxy_host<\/tSTRING>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tDWORD name=\"ProxyPort\"><\/tDWORD>/<tDWORD name=\"ProxyPort\">$proxy_port<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-
-  echo "done"
-}
-
-#proxy_enable_desinfect2016 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable_desinfect2016() {
-
-  proxy_enable $1 $2 $3
-
-  echo -n "enable proxy for desinfect's av ... "
-
-  chroot_dir="$1"
-  proxy_host="$2"
-  proxy_port="$3"
-  tmp_file_344532="`mktemp`"
-
-  #Avast AntiVirus
-  sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-  sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-
-  #Clam AV
-  cat "$chroot_dir/etc/clamav/freshclam.conf" | grep -v "HTTPProxyServer" | grep -v "HTTPProxyPort" > "$tmp_file_344532"
-  rm "$chroot_dir/etc/clamav/freshclam.conf"
-  cp "$tmp_file_344532" "$chroot_dir/etc/clamav/freshclam.conf"
-
-  echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
-  echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
-
-  #Eset AV
-  cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "proxy_addr" | grep -v "proxy_port" > "$tmp_file_344532"
-  rm "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-  cp "$tmp_file_344532" "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-  echo "proxy_addr = \"$proxy_host\"" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-  echo "proxy_port = $proxy_port" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-  #Kaspersky
-  sed -i "s/<tDWORD name=\"UseProxy\">0<\/tDWORD>/<tDWORD name=\"UseProxy\">1<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tSTRING name=\"ProxyHost\"><\/tSTRING>/<tSTRING name=\"ProxyHost\">$proxy_host<\/tSTRING>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tDWORD name=\"ProxyPort\"><\/tDWORD>/<tDWORD name=\"ProxyPort\">$proxy_port<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-
-  rm "$tmp_file_344532"
-  tmp_file_344532=
-
-  echo "done"
-}
-
-#proxy_enable_desinfect.17 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable_desinfect.17() {
-
-  proxy_enable $1 $2 $3
-
-  echo "enable proxy for desinfect's av ... "
-
-  chroot_dir="$1"
-  proxy_host="$2"
-  proxy_port="$3"
-  tmp_file_344532="`mktemp`"
-
-  #Avast AntiVirus
-  if [ -f "$chroot_dir/AntiVirUpdate/avupdate" ]; then
-    echo "Avast AntiVirus: Found"
-    sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-    sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-  else
-    eco "Avast AntiVirus: NOT Found"
-  fi
-
-  #Eset AV
-  if [ -f "$chroot_dir/etc/opt/eset/esets/esets.cfg" ]; then
-    echo "Eset AV: Found"
-    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "proxy_addr" | grep -v "proxy_port" > "$tmp_file_344532"
-    rm "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-    cp "$tmp_file_344532" "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-    echo "proxy_addr = \"$proxy_host\"" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-    echo "proxy_port = $proxy_port" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-  else
-    eco "Eset AV: NOT Found"
-  fi
-
-  #ClamAV
-  if [ -f "$chroot_dir/etc/clamav/freshclam.conf" ]; then
-    echo "ClamAV: Found"
-    cat "$chroot_dir/etc/clamav/freshclam.conf" | grep -v "HTTPProxyServer" | grep -v "HTTPProxyPort" > "$tmp_file_344532"
-    rm "$chroot_dir/etc/clamav/freshclam.conf"
-    cp "$tmp_file_344532" "$chroot_dir/etc/clamav/freshclam.conf"
-
-    echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
-    echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
-  else
-    eco "ClamAV: NOT Found"
-  fi
-
-  #Sophos
-  if [ -f ""$chroot_dir/opt/sophos-av/etc/savd.cfg"" ]; then
-    echo "Sophos: Found"
-    echo "<Source>sophos:</Source><Proxy><Address>http://$proxy_host:$proxy_port</Proxy></Address>" >> "$chroot_dir/opt/sophos-av/etc/savd.cfg"
-  else
-    eco "Sophos: NOT Found"
-  fi
-
-  #F-Secure
-  if [ -f "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" ]; then
-    echo "F-Secure: Found"
-    echo "enable_fsma=no" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
-    echo "update_servers=http://fsbwserver-direct.f-secure.com" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
-    echo "update_proxies=http://$proxy_host:$proxy_port" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
-    echo "http_proxies=http://$proxy_host:$proxy_port" >> "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template"
-    cat "$chroot_dir/opt/f-secure/fsaua/fsaua_config.template" > "$chroot_dir/etc/opt/f-secure/fsaua/fsaua_config"
-  else
-    eco "F-Secure: NOT Found"
-  fi
-
-
-  rm "$tmp_file_344532"
-  tmp_file_344532=
-
-  echo "done"
-}
-
-
-### dns
-#dns_set [chroot_dir] [domain] [nameserver]
-function dns_set() {
-  echo -n "set dns config ... "
-
-  rm "$chroot_dir/etc/resolv.conf"
-
-  [ "$2" != "" ] && echo "domain $2" >> "$chroot_dir/etc/resolv.conf"
-  echo "search $2" >> "$chroot_dir/etc/resolv.conf"
-  for namesv in `echo "$3" | tr "," " "`; do
-    echo "nameserver $namesv" >> "$chroot_dir/etc/resolv.conf"
-  done
-
-  echo "done"
-}
-
-### source list
-
-#sourcelist_desinfect_set_nomal2015 [chroot_dir]
-function sourcelist_desinfect_set_nomal2015() {
-  echo -n "build normal source.list ... "
-  #$1 = chroot directory
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2015 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2015 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "# #### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
-  echo "# deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#sourcelist_desinfect_set_nomal2016 [chroot_dir]
-function sourcelist_desinfect_set_nomal2016() {
-  echo -n "build normal source.list ... "
-  #$1 = chroot directory
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2016 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2016 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "# #### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
-  echo "# deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#sourcelist_desinfect_set_nomal2017 [chroot_dir]
-function sourcelist_desinfect_set_nomal2017() {
-  echo -n "build normal source.list ... "
-  #$1 = chroot directory
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2017 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2017 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "# #### Ubuntu 16.04 LTS (Xenial) ####" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
-  echo "# deb http://extras.ubuntu.com/ubuntu xenial main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#sourcelist_desinfect_set_extendet2015 [chroot_dir]
-function sourcelist_desinfect_set_extendet2015() {
-  echo -n "build extendet source.list ... "
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2015 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2015 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "#### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "## developers who want to ship their latest software." >> "$sourcelist"
-  echo "deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#sourcelist_desinfect_set_extendet2016 [chroot_dir]
-function sourcelist_desinfect_set_extendet2016() {
-  echo -n "build extendet source.list ... "
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2016 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2016 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "#### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "## developers who want to ship their latest software." >> "$sourcelist"
-  echo "deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#sourcelist_desinfect_set_extendet2017 [chroot_dir]
-function sourcelist_desinfect_set_extendet2017() {
-  echo -n "build extendet source.list ... "
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2017 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2017 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "#### Ubuntu 16.04 LTS (Xenial) ####" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://security.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "## developers who want to ship their latest software." >> "$sourcelist"
-  echo "deb http://extras.ubuntu.com/ubuntu xenial main" >> "$sourcelist"
-
-  echo "done"
-}
-
-### Update ###
-
-#os_update [chroot_dir]
-#-> proj/debian
-
-#os_update_desinfect2015 [chroot_dir]
-function os_update_desinfect2015() {
-  #$1 = chroot directory
-
-  chroot_dir="$1"
-
-  #call main os_update
-  os_update "$chroot_dir"
-
-  echo "update virus definitions ... "
-
-  #BitDefender
-  chroot "$chroot_dir" /bin/bash -c "bdscan --update" | grep -v "... updated"
-
-  #Avast Avira
-  chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
-
-  #Clam AV
-  chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
-  rm -f "$chroot_dir/var/lib/clamav/daily.cld"
-
-  #Karspersky
-  echo '#!/bin/bash' > "$chroot_dir/tmp/up_kasp"
-  echo 'PATH=/usr/lib/kl:$PATH' >> "$chroot_dir/tmp/up_kasp"
-  echo 'LD_LIBRARY_PATH=/usr/lib/kl:$LD_LIBRARY_PATH' >> "$chroot_dir/tmp/up_kasp"
-  echo 'KL_PLUGINS_PATH=/usr/lib/kl' >> "$chroot_dir/tmp/up_kasp"
-  echo 'export PATH LD_LIBRARY_PATH KL_PLUGINS_PATH' >> "$chroot_dir/tmp/up_kasp"
-  echo '/usr/lib/kl/kav update' >> "$chroot_dir/tmp/up_kasp"
-  chmod +x  "$chroot_dir/tmp/up_kasp"
-  chroot "$chroot_dir" /bin/bash -c "/tmp/up_kasp" | grep -v ".kdc" | grep -v "File downloaded"
-  rm "$chroot_dir/tmp/up_kasp"
-
-
-  echo "done"
-}
-
-#os_update_desinfect2016 [chroot_dir]
-function os_update_desinfect2016() {
-  #$1 = chroot directory
-
-  chroot_dir="$1"
-
-  #call main os_update
-  os_update "$chroot_dir"
-
-  echo "update virus definitions ... "
-
-  #Avast Avira
-  {
-    echo "Avira ..."
-    chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
-    echo "Avira done"
-  }
-
-  #Clam AV
-  {
-    echo "ClamAV..."
-    chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
-    rm -f "$chroot_dir/var/lib/clamav/daily.cld"
-    echo "ClamAV done"
-  }
-
-  #Eset AV
-  {
-    echo "Eset AV ..."
-    tmp_file_23421="`mktemp`"
-    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "av_update_username" | grep -v "av_update_password" > "$tmp_file_23421"
-    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-    chroot "$chroot_dir" /bin/bash -c "/usr/bin/esetrand" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-    echo "set timeout: 2min"
-    av_eaet_timeout=1200
-    tmp_var_3092="`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`"
-
-    #eig. update routine
-    chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets restart"
-    sleep 2
-    chroot "$chroot_dir" /bin/bash -c "/opt/eset/esets/sbin/esets_daemon --update"
-
-    #warten auf daemon update ...
-    sleep 10m
-    echo "wait 10min for Eset AV update"
-    while [ "`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`" == "$tmp_var_3092" ]; do
-      sleep 1
-      av_eaet_timeout=$((av_eaet_timeout-1))
-      [ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
-    done
-
-    sleep 4
-
-    chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
-
-    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-    rm "$tmp_file_23421"
-    tmp_file_23421=
-    tmp_var_3092=
-    echo "Eset AV done"
-  }
-
-  #Karspersky
-  {
-    echo "Karspersky ..."
-    #gen update-scrypt
-    echo '#!/bin/bash' > "$chroot_dir/tmp/up_kasp"
-    echo 'PATH=/usr/lib/kl:$PATH' >> "$chroot_dir/tmp/up_kasp"
-    echo 'LD_LIBRARY_PATH=/usr/lib/kl:$LD_LIBRARY_PATH' >> "$chroot_dir/tmp/up_kasp"
-    echo 'KL_PLUGINS_PATH=/usr/lib/kl' >> "$chroot_dir/tmp/up_kasp"
-    echo 'export PATH LD_LIBRARY_PATH KL_PLUGINS_PATH' >> "$chroot_dir/tmp/up_kasp"
-    echo '/usr/lib/kl/kav update' >> "$chroot_dir/tmp/up_kasp"
-    chmod +x  "$chroot_dir/tmp/up_kasp"
-
-    chroot "$chroot_dir" /bin/bash -c "/tmp/up_kasp" | grep -v ".kdc" | grep -v "File downloaded"
-    rm "$chroot_dir/tmp/up_kasp"
-    echo "Karspersky done"
-  }
-
-  echo "update virus definitions done"
-}
-
-#os_update_desinfect.17 [chroot_dir]
-function os_update_desinfect.17() {
-  #$1 = chroot directory
-
-  chroot_dir="$1"
-
-  #call main os_update
-  os_update "$chroot_dir"
-
-  echo "update virus definitions ... "
-
-  #Avast Avira
-  {
-    echo "Avira ..."
-    #chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; /AntiVirUpdate/avupdate" | grep -v " -> "
-    chroot_sh "$chroot_dir" "/AntiVirUpdate/avupdate" | grep -v " -> "
-    echo "Avira done"
-  }
-
-  #Clam AV
-  {
-    echo "ClamAV..."
-    #chroot "$chroot_dir" /bin/bash --login -c ". /tmp/env.sh; freshclam" > /dev/null
-    chroot_sh "$chroot_dir" "freshclam" > /dev/null
-    rm -f "$chroot_dir/var/lib/clamav/daily.cld"
-    echo "ClamAV done"
-  }
-
-  #Eset AV
-  {
-    echo "Eset AV ..."
-    tmp_file_23421="`mktemp`"
-    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "av_update_username" | grep -v "av_update_password" > "$tmp_file_23421"
-    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-    chroot "$chroot_dir" /bin/bash -c "/usr/bin/esetrand" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-    av_eaet_timeout=300
-    echo "set timeout: $((av_eaet_timeout/60))min"
-    tmp_var_3092="`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`"
-
-    #eig. update routine
-    #chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets restart"
-    chroot_sh "$chroot_dir" "/etc/init.d/esets restart"
-    sleep 2
-    #chroot "$chroot_dir" /bin/bash --login -c "/opt/eset/esets/sbin/esets_daemon --update"
-    chroot_sh "$chroot_dir" "/opt/eset/esets/sbin/esets_daemon --update"
-
-    #warten auf daemon update ...
-    echo "wait $((av_eaet_timeout/60))min for Eset AV update"
-    while [ "`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`" == "$tmp_var_3092" ]; do
-      sleep 10
-      av_eaet_timeout=$((av_eaet_timeout-10))
-      [ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
-    done
-
-    sleep 4
-
-    #chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
-    chroot_sh "$chroot_dir" "/etc/init.d/esets stop"
-
-    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-    rm "$tmp_file_23421"
-    tmp_file_23421=
-    tmp_var_3092=
-    echo "Eset AV done"
-  }
-
-  #Sophos
-  {
-    echo "Sophos..."
-    #chroot "$chroot_dir" /bin/bash --login -c "/opt/sophos-av/bin/savupdate -v3"
-    chroot_sh "$chroot_dir" "/opt/sophos-av/bin/savupdate -v3"
-    chroot_sh "$chroot_dir" "/opt/sophos-av/bin/savdstatus --version"
-    #chroot "$chroot_dir" /bin/bash -c "/opt/sophos-av/bin/savupdate -v3 -a"
-    echo "Sophos done"
-  }
-
-  #F-Secure
-  {
-    echo "F-Secure..."
-    chroot_sh "$chroot_dir" "/etc/init.d/fsaua start"
-    chroot_sh "$chroot_dir" "/etc/init.d/fsupdate stop"
-    ( sleep 1m; chroot_sh "$chroot_dir" "/etc/init.d/fsaua start" ) &
-    chroot_sh "$chroot_dir" "/opt/f-secure/fssp/bin/dbupdate_lite" && echo "Update Success"
-    sleep 1m
-    chroot_sh "$chroot_dir" "/etc/init.d/fsaua stop"
-    chroot_sh "$chroot_dir" "/etc/init.d/fsupdate stop"
-    echo "F-Secure done"
-  }
-
-  echo "update virus definitions done"
-}
-
-
-### Tools ###
-
-#tools_add [chroot_dir] [tools_list]
-#-> proj/debian
-
-#tools_add_desinfect2015 [chroot_dir] [tools_list]
-function tools_add_desinfect2015() {
-  #$1 = chroot directory
-  chroot_dir="$1"
-  tools_list="$2"
-
-  sourcelist_desinfect_set_extendet2015 "$chroot_dir"
-  tools_add "$chroot_dir" "$tools_list"
-  sourcelist_desinfect_set_nomal2015 "$chroot_dir"
-}
-
-#tools_add_desinfect2016 [chroot_dir] [tools_list]
-function tools_add_desinfect2016() {
-  #$1 = chroot directory
-  chroot_dir="$1"
-  tools_list="$2"
-
-  sourcelist_desinfect_set_extendet2016 "$chroot_dir"
-  tools_add "$chroot_dir" "$tools_list"
-  sourcelist_desinfect_set_nomal2016 "$chroot_dir"
-}
-
-#tools_add_desinfect.17 [chroot_dir] [tools_list]
-function tools_add_desinfect.17() {
-  #$1 = chroot directory
-  chroot_dir="$1"
-  tools_list="$2"
-
-  sourcelist_desinfect_set_extendet2017 "$chroot_dir"
-  tools_add "$chroot_dir" "$tools_list"
-  sourcelist_desinfect_set_nomal2017 "$chroot_dir"
-}
-
 source <LIBDIR>/proj/desinfect.17
 
 ### Handle Parameters & Modes ###

From fbf1a80b7bb6bf77da5165bc8277aa67201556b0 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 13:05:02 +0200
Subject: [PATCH 33/55] add idear

---
 doc/draft_mod-pronects | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/draft_mod-pronects

diff --git a/doc/draft_mod-pronects b/doc/draft_mod-pronects
new file mode 100644
index 0000000..2e8f466
--- /dev/null
+++ b/doc/draft_mod-pronects
@@ -0,0 +1,19 @@
+maddl@NB-Maddl:~$ function a() { echo null; }
+maddl@NB-Maddl:~$ a
+null
+maddl@NB-Maddl:~$ function a_desinfect() { echo desinfect; }
+maddl@NB-Maddl:~$ a_desinfect 
+desinfect
+maddl@NB-Maddl:~$ alias a=a_desinfect
+maddl@NB-Maddl:~$ a
+desinfect
+maddl@NB-Maddl:~$ alias --help
+bash: alias: --: Ungültige Option
+alias: Gebrauch: alias [-p] [Name[=Wert] ... ]
+maddl@NB-Maddl:~$ man alias 
+Kein Handbucheintrag für alias vorhanden
+maddl@NB-Maddl:~$ alias a=a
+maddl@NB-Maddl:~$ a
+null
+maddl@NB-Maddl:~$ 
+

From f77f690751552b2e1708c63a5177b318bcbf94ea Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 16:15:36 +0200
Subject: [PATCH 34/55] change proj-head docu for script

---
 doc/proj-head | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/proj-head b/doc/proj-head
index 2b70ea3..8b02794 100755
--- a/doc/proj-head
+++ b/doc/proj-head
@@ -3,6 +3,6 @@
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
 #<PROJECT_NAME>
-# . -> <PROJECT_PARENT> -> <PROJECT_BASE>
-source <LIBDIR>/proj/<PROJECT_PARENT>
+#<project_relation>
+source <LIBDIR>/proj/<BASE>
 project_relation="<PROJECT_NAME> $project_relation"

From 10dce09e4dbcee16c8daad16b3425893c92144af Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 16:16:07 +0200
Subject: [PATCH 35/55] add proj gen script

---
 script/add_project.sh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100755 script/add_project.sh

diff --git a/script/add_project.sh b/script/add_project.sh
new file mode 100755
index 0000000..5205581
--- /dev/null
+++ b/script/add_project.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+#check param
+[ -z "$1" ] && { echo "$0 \"name\" [base]"; exit 1; }
+name="$1"
+base="$2"
+
+#gen project
+cp "doc/proj-head" "src/proj/$name"
+
+#set base_relations
+if [ -z "$base" ]; then
+  base_relations="base"
+  base="base"
+  sed -i "/project_relation=/c\project_relation=\"<PROJECT_NAME>\"" "src/proj/$name"
+else
+  [ -f "src/proj/$base" ] || {
+    echo "BASE: $base dont exist"
+    exit 1
+  }
+  #get base of $base
+  base_base=`grep '# . ->' src/proj/$base`
+  base_relations=`echo $base_base | sed "s/#\ \./$base/g"`
+fi
+
+## replace strings
+# . -> <PROJECT_PARENT> -> base
+sed -i "s/<project_relation>/\ \.\ ->\ $base_relations/g" "src/proj/$name"
+#<PROJECT_NAME>
+sed -i "s/<PROJECT_NAME>/$name/g" "src/proj/$name"
+sed -i "s/<BASE>/$base/g" "src/proj/$name"
+
+#open
+editor "src/proj/$name"

From 8990b7ea1e66cb0010a6ea4d6898c4680a6da21e Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 16:16:22 +0200
Subject: [PATCH 36/55] add base template

---
 src/proj/base | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100755 src/proj/base

diff --git a/src/proj/base b/src/proj/base
new file mode 100755
index 0000000..6e03c0d
--- /dev/null
+++ b/src/proj/base
@@ -0,0 +1,30 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+##################
+##### B a s e ####
+##################
+# .
+project_relation=""
+[ -z "$project" ] && project=base
+
+#tools_add [chroot_dir] [tools_list]
+function tools_add() {
+	echo "$project: tools_add ot available"
+}
+
+#os_update [chroot_dir]
+function os_update() {
+	echo "$project: os_update ot available"
+}
+
+#proxy_enable [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable() {
+	echo "$project: proxy_enable ot available"
+}
+
+#dns_set [chroot_dir] [domain] [nameserver]
+function dns_set() {
+	echo "$project: dns_set ot available"
+}

From 013edd6c0f345ff662bee56bb4e2383a591be4b7 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 16:20:42 +0200
Subject: [PATCH 37/55] change debian template for script

---
 src/proj/debian | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/proj/debian b/src/proj/debian
index 3ac9a45..299a347 100755
--- a/src/proj/debian
+++ b/src/proj/debian
@@ -2,11 +2,15 @@
 #remaster lib
 [ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
 
+source <LIBDIR>/proj/base
+#debian
+# . -> base
+project_relation="debian"
+
 ####################################
 ##### Base Template D E B I A N ####
 ####################################
-# .
-project_relation="debian"
+
 
 #tools_add [chroot_dir] [tools_list]
 function tools_add() {

From 15f5ad5fab6348176dd2f829367d239fd18d20d2 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 21 May 2018 16:25:43 +0200
Subject: [PATCH 38/55] example in debian template

---
 src/proj/debian | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/proj/debian b/src/proj/debian
index 299a347..107fbb5 100755
--- a/src/proj/debian
+++ b/src/proj/debian
@@ -13,7 +13,7 @@ project_relation="debian"
 
 
 #tools_add [chroot_dir] [tools_list]
-function tools_add() {
+function tools_add-debian() {
 	echo "add tools ... "
 	#$1 = chroot directory
 	chroot_dir="$1"
@@ -24,9 +24,10 @@ function tools_add() {
 	chroot "$chroot_dir" /bin/bash -c "apt-get install -y $tools_list" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:"
 	echo "done"
 }
+alias tools_add="tools_add-debian"
 
 #os_update [chroot_dir]
-function os_update() {
+function os_update-debian() {
 	echo "updating os ... "
 	#$1 = chroot directory
 
@@ -39,9 +40,10 @@ function os_update() {
 
 	echo "done"
 }
+alias os_update="os_update-debian"
 
 #proxy_enable [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable() {
+function proxy_enable-debian() {
   echo -n "enable proxy ... "
 
   chroot_dir="$1"
@@ -77,9 +79,10 @@ function proxy_enable() {
     fi
   fi
 }
+alias proxy_enable="proxy_enable-debian"
 
 #dns_set [chroot_dir] [domain] [nameserver]
-function dns_set() {
+function dns_set-debian() {
   echo -n "set dns config ... "
 
   rm "$chroot_dir/etc/resolv.conf"
@@ -92,3 +95,4 @@ function dns_set() {
 
   echo "done"
 }
+alias dns_set="dns_set-debian"

From c4eeb44eaaff4b12de5912b97d2fd91dec1c6e30 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 00:30:51 +0200
Subject: [PATCH 39/55] use online functions instead alias

---
 src/proj/debian | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/proj/debian b/src/proj/debian
index 107fbb5..5fe9c2b 100755
--- a/src/proj/debian
+++ b/src/proj/debian
@@ -24,7 +24,7 @@ function tools_add-debian() {
 	chroot "$chroot_dir" /bin/bash -c "apt-get install -y $tools_list" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:"
 	echo "done"
 }
-alias tools_add="tools_add-debian"
+function tools_add() { tools_add-debian $@ }
 
 #os_update [chroot_dir]
 function os_update-debian() {
@@ -40,7 +40,7 @@ function os_update-debian() {
 
 	echo "done"
 }
-alias os_update="os_update-debian"
+function os_update() { os_update-debian $@ }
 
 #proxy_enable [chroot_dir] [proxy_host] [proxy_port]
 function proxy_enable-debian() {
@@ -79,7 +79,7 @@ function proxy_enable-debian() {
     fi
   fi
 }
-alias proxy_enable="proxy_enable-debian"
+function proxy_enable() { proxy_enable-debian $@ }
 
 #dns_set [chroot_dir] [domain] [nameserver]
 function dns_set-debian() {
@@ -95,4 +95,4 @@ function dns_set-debian() {
 
   echo "done"
 }
-alias dns_set="dns_set-debian"
+function dns_set() { dns_set-debian $@ }

From 29a8d529c9b2502478f9ea4a3c2b85d2d116c9d1 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 00:46:31 +0200
Subject: [PATCH 40/55] remove special function cals

---
 src/remaster.sh | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/remaster.sh b/src/remaster.sh
index d6060d2..39e6228 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -111,8 +111,6 @@ function main_renew() {
 
   check_update >> "$log_file"
 
-  [ "$project" != "" ] && project="_$project"
-
   # 2. Entpacke ISO
   iso_extract "$iso_source" "$iso_extr_dir"  >> "$log_file"
 
@@ -128,12 +126,12 @@ function main_renew() {
 
   # 4. Vorbereiten für chroot-Umgebung:
 
-  chroot_initial$project "$chroot_path" >> "$log_file"
+  chroot_initial "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 5. Setzen der Netzwerk-Einstellungen:
   [ -n "$proxy_host" ] && {
-    proxy_enable$project "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
+    proxy_enable "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
   }
 
@@ -141,12 +139,12 @@ function main_renew() {
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 6. Updaten von Desinfec't:
-  os_update$project "$chroot_path" >> "$log_file"
+  os_update "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 7. Installation optionaler Tools:
 
-  tools_add$project "$chroot_path" "$tools_list" >> "$log_file"
+  tools_add "$chroot_path" "$tools_list" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   #addo ClamAV to conky_info
@@ -169,7 +167,7 @@ function main_renew() {
 
   # 9. Umount - Chroot Umgebung auflösen
 
-  chroot_umount$project "$chroot_path" >> "$log_file"
+  chroot_umount "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   #Überprüfen ob alles ausgehängt wurde
@@ -187,7 +185,7 @@ function main_renew() {
 
   # wenn iso gewünscht
   [ "$iso_aim" != "" ] && {
-    iso_create$project "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
+    iso_create "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
   }
 
@@ -266,8 +264,6 @@ function main_update_pxe() {
   check_config >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  [ "$project" != "" ] && project="_$project"
-
   # 1. Entpacken der Dateien des Live-Systems
   [ -e "$squashfs_path" ] || {
     echo "### ERROR ### \"$squashfs_path\" does not exist!" >> "$log_file"
@@ -279,7 +275,7 @@ function main_update_pxe() {
 
   # 2. Vorbereiten für chroot-Umgebung:
 
-  chroot_initial$project "$chroot_path" >> "$log_file"
+  chroot_initial "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 3. Setzen der Netzwerk-Einstellungen:
@@ -288,7 +284,7 @@ function main_update_pxe() {
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 4. Updaten von Desinfec't:
-  os_update$project "$chroot_path" >> "$log_file"
+  os_update "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 5. Manuelle Aktionen - deaktiviert
@@ -301,7 +297,7 @@ function main_update_pxe() {
 
   # 6. Umount - Chroot Umgebung auflösen
 
-  chroot_umount$project "$chroot_path" >> "$log_file"
+  chroot_umount "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   #Überprüfen ob alles ausgehängt wurde
@@ -391,8 +387,6 @@ function main_update_iso() {
   check_config >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  [ "$project" != "" ] && project="_$project"
-
   # 2. Entpacke ISO
   iso_extract "$iso_source" "$iso_extr_dir"  >> "$log_file"
 
@@ -418,12 +412,12 @@ function main_update_iso() {
 
   # 4. Vorbereiten für chroot-Umgebung:
 
-  chroot_initial$project "$chroot_path" >> "$log_file"
+  chroot_initial "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 5. Setzen der Netzwerk-Einstellungen:
   [ -n "$proxy_host" ] && {
-    proxy_enable$project "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
+    proxy_enable "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
   }
 
@@ -431,12 +425,12 @@ function main_update_iso() {
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 6. Updaten von Desinfec't:
-  os_update$project "$chroot_path" >> "$log_file"
+  os_update "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   # 7. Installation optionaler Tools:
 
-  tools_add$project "$chroot_path" "$tools_list" >> "$log_file"
+  tools_add "$chroot_path" "$tools_list" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   #addo ClamAV to conky_info
@@ -454,7 +448,7 @@ function main_update_iso() {
 
   # 9. Umount - Chroot Umgebung auflösen
 
-  chroot_umount$project "$chroot_path" >> "$log_file"
+  chroot_umount "$chroot_path" >> "$log_file"
   error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
   #Überprüfen ob alles ausgehängt wurde
@@ -472,7 +466,7 @@ function main_update_iso() {
 
   # wenn iso gewünscht
   [ "$iso_aim" != "" ] && {
-    iso_create$project "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
+    iso_create "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
     error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
   }
 
@@ -566,7 +560,10 @@ source <LIBDIR>/func/chroot_is_mounted
 #chroot_sh [chroot_dir] [command]
 source <LIBDIR>/func/chroot_sh
 
+####################################
+### Workaround - set Project
 source <LIBDIR>/proj/desinfect.17
+####################################
 
 ### Handle Parameters & Modes ###
 

From 2752dcc5ca8dcd15a6942b315502495bc4b0581b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 00:47:11 +0200
Subject: [PATCH 41/55] change desinfect.17 to overload some funktions

---
 src/proj/desinfect.17 | 49 ++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/src/proj/desinfect.17 b/src/proj/desinfect.17
index 6f6d334..e4085da 100755
--- a/src/proj/desinfect.17
+++ b/src/proj/desinfect.17
@@ -69,14 +69,14 @@ function sourcelist_desinfect_set_extendet2017() {
   echo "done"
 }
 
-#os_update_desinfect.17 [chroot_dir]
-function os_update_desinfect.17() {
+#os_update-desinfect.17 [chroot_dir]
+function os_update-desinfect.17() {
   #$1 = chroot directory
 
   chroot_dir="$1"
 
-  #call main os_update
-  os_update "$chroot_dir"
+  #call main os_update from debian
+  os_update-debian "$chroot_dir"
 
   echo "update virus definitions ... "
 
@@ -162,37 +162,12 @@ function os_update_desinfect.17() {
 
   echo "update virus definitions done"
 }
+function os_update() { os_update-desinfect.17 $@ }
 
-#iso_create_desinfect.17 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
-function iso_create_desinfect.17() {
-  #echo "prepere iso folder ... "
+#proxy_enable-desinfect.17 [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable-desinfect.17() {
 
-  chroot_path="$1"
-  iso_extr_dir="$2"
-  iso_aim="$3"
-  iso_lable="$4"
-
-  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
-}
-
-#chroot_initial_desinfect.17 [chroot_dir]
-function chroot_initial_desinfect.17() {
-  #$1 = chroot dir
-
-  chroot_initial "$1"
-
-}
-
-#chroot_umount_desinfect.17 [chroot_dir]
-function chroot_umount_desinfect.17() {
-  #call main mount
-  chroot_umount "$1"
-}
-
-#proxy_enable_desinfect.17 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable_desinfect.17() {
-
-  proxy_enable $1 $2 $3
+  proxy_enable-debian $1 $2 $3
 
   echo "enable proxy for desinfect's av ... "
 
@@ -262,14 +237,16 @@ function proxy_enable_desinfect.17() {
 
   echo "done"
 }
+function proxy_enable() { proxy_enable-desinfect.17 $@ }
 
-#tools_add_desinfect.17 [chroot_dir] [tools_list]
-function tools_add_desinfect.17() {
+#tools_add-desinfect.17 [chroot_dir] [tools_list]
+function tools_add-desinfect.17() {
   #$1 = chroot directory
   chroot_dir="$1"
   tools_list="$2"
 
   sourcelist_desinfect_set_extendet2017 "$chroot_dir"
-  tools_add "$chroot_dir" "$tools_list"
+  tools_add-debian "$chroot_dir" "$tools_list"
   sourcelist_desinfect_set_nomal2017 "$chroot_dir"
 }
+function tools_add() { tools_add-desinfect.17 $@ }

From 32d09b764b1fe47f091e37ad7aca56d6f92e1954 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 00:58:05 +0200
Subject: [PATCH 42/55] overlod functions...

---
 src/proj/desinfect.15 | 42 ++++++++++++++++++---------------
 src/proj/desinfect.16 | 54 ++++++++++++++++---------------------------
 2 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/src/proj/desinfect.15 b/src/proj/desinfect.15
index 7639578..0bc0081 100755
--- a/src/proj/desinfect.15
+++ b/src/proj/desinfect.15
@@ -9,8 +9,8 @@ project_relation="desinfect.15 $project_relation"
 
 
 
-#iso_create_desinfect2015 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
-function iso_create_desinfect2015() {
+#iso_create-desinfect.15 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
+function iso_create-desinfect.15() {
   echo "prepere iso folder ... "
 
   chroot_path="$1"
@@ -24,14 +24,15 @@ function iso_create_desinfect2015() {
 
   echo "done"
 
-  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
+  iso_create-debian  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
 }
+function iso_create() { iso_create-desinfect.15 $@ }
 
-#chroot_initial_desinfect2015 [chroot_dir]
-function chroot_initial_desinfect2015() {
+#chroot_initial-desinfect.15 [chroot_dir]
+function chroot_initial-desinfect.15() {
   #$1 = chroot dir
 
-  chroot_initial "$1"
+  chroot_initial-debian "$1"
 
   echo -n "initial desinfect on chroot ... "
 
@@ -49,11 +50,12 @@ function chroot_initial_desinfect2015() {
 
   echo "done"
 }
+function iso_create() { iso_create-desinfect.15 $@ }
 
-#chroot_umount_desinfect2015 [chroot_dir]
-function chroot_umount_desinfect2015() {
+#chroot_umount-desinfect.15 [chroot_dir]
+function chroot_umount-desinfect.15() {
   #call main mount
-  chroot_umount "$1"
+  chroot_umount-debian "$1"
 
   echo -n "unmount desinfect on chroot ... "
   #check chroot dir
@@ -74,11 +76,12 @@ function chroot_umount_desinfect2015() {
 
   echo "done"
 }
+function chroot_umount() { chroot_umount-desinfect.15 $@ }
 
-#proxy_enable_desinfect2015 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable_desinfect2015() {
+#proxy_enable-desinfect.15 [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable-desinfect.15() {
 
-  proxy_enable $1 $2 $3
+  proxy_enable-debian $1 $2 $3
 
   echo -n "enable proxy for desinfect's av ... "
 
@@ -105,6 +108,7 @@ function proxy_enable_desinfect2015() {
 
   echo "done"
 }
+function proxy_enable() { proxy_enable-desinfect.15 $@ }
 
 #sourcelist_desinfect_set_nomal2015 [chroot_dir]
 function sourcelist_desinfect_set_nomal2015() {
@@ -173,14 +177,14 @@ function sourcelist_desinfect_set_extendet2015() {
   echo "done"
 }
 
-#os_update_desinfect2015 [chroot_dir]
-function os_update_desinfect2015() {
+#os_update-desinfect.15 [chroot_dir]
+function os_update-desinfect.15() {
   #$1 = chroot directory
 
   chroot_dir="$1"
 
   #call main os_update
-  os_update "$chroot_dir"
+  os_update-debian "$chroot_dir"
 
   echo "update virus definitions ... "
 
@@ -208,14 +212,16 @@ function os_update_desinfect2015() {
 
   echo "done"
 }
+function os_update() { os_update-desinfect.15 $@ }
 
-#tools_add_desinfect2015 [chroot_dir] [tools_list]
-function tools_add_desinfect2015() {
+#tools_add-desinfect.15 [chroot_dir] [tools_list]
+function tools_add-desinfect.15() {
   #$1 = chroot directory
   chroot_dir="$1"
   tools_list="$2"
 
   sourcelist_desinfect_set_extendet2015 "$chroot_dir"
-  tools_add "$chroot_dir" "$tools_list"
+  tools_add-debian "$chroot_dir" "$tools_list"
   sourcelist_desinfect_set_nomal2015 "$chroot_dir"
 }
+function tools_add() { tools_add-desinfect.15 $@ }
diff --git a/src/proj/desinfect.16 b/src/proj/desinfect.16
index 9c8246d..03e8d60 100755
--- a/src/proj/desinfect.16
+++ b/src/proj/desinfect.16
@@ -8,30 +8,11 @@ source <LIBDIR>/proj/ubuntu.14.04
 project_relation="desinfect.16 $project_relation"
 
 
-
-#iso_create_desinfect2016 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
-function iso_create_desinfect2016() {
-  #echo "prepere iso folder ... "
-
-  chroot_path="$1"
-  iso_extr_dir="$2"
-  iso_aim="$3"
-  iso_lable="$4"
-
-  #desinfect
-  #rm "$iso_extr_dir/casper/initrd.lz"
-  #wget http://www.heise.de/ct/projekte/desinfect/des15/initrd.lz -O "$iso_extr_dir/casper/initrd.lz"
-
-  #echo "done"
-
-  iso_create  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
-}
-
-#chroot_initial_desinfect2016 [chroot_dir]
-function chroot_initial_desinfect2016() {
+#chroot_initial-desinfect.16 [chroot_dir]
+function chroot_initial-desinfect.16() {
   #$1 = chroot dir
 
-  chroot_initial "$1"
+  chroot_initial-debian "$1"
 
   echo -n "initial desinfect on chroot ... "
 
@@ -47,11 +28,12 @@ function chroot_initial_desinfect2016() {
 
   echo "done"
 }
+function chroot_initial() { chroot_initial-desinfect.16 $@ }
 
-#chroot_umount_desinfect2016 [chroot_dir]
-function chroot_umount_desinfect2016() {
+#chroot_umount-desinfect.16 [chroot_dir]
+function chroot_umount-desinfect.16() {
   #call main mount
-  chroot_umount "$1"
+  chroot_umount-debian "$1"
 
   echo -n "unmount desinfect on chroot ... "
   #check chroot dir
@@ -69,11 +51,12 @@ function chroot_umount_desinfect2016() {
 
   echo "done"
 }
+function chroot_umount() { chroot_umount-desinfect.16 $@ }
 
-#proxy_enable_desinfect2016 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable_desinfect2016() {
+#proxy_enable-desinfect.16 [chroot_dir] [proxy_host] [proxy_port]
+function proxy_enable-desinfect.16() {
 
-  proxy_enable $1 $2 $3
+  proxy_enable-debian $1 $2 $3
 
   echo -n "enable proxy for desinfect's av ... "
 
@@ -112,6 +95,7 @@ function proxy_enable_desinfect2016() {
 
   echo "done"
 }
+function proxy_enable() { proxy_enable-desinfect.16 $@ }
 
 #sourcelist_desinfect_set_nomal2016 [chroot_dir]
 function sourcelist_desinfect_set_nomal2016() {
@@ -180,14 +164,14 @@ function sourcelist_desinfect_set_extendet2016() {
   echo "done"
 }
 
-#os_update_desinfect2016 [chroot_dir]
-function os_update_desinfect2016() {
+#os_update-desinfect.16 [chroot_dir]
+function os_update-desinfect.16() {
   #$1 = chroot directory
 
   chroot_dir="$1"
 
   #call main os_update
-  os_update "$chroot_dir"
+  os_update-debian "$chroot_dir"
 
   echo "update virus definitions ... "
 
@@ -263,14 +247,16 @@ function os_update_desinfect2016() {
 
   echo "update virus definitions done"
 }
+function os_update() { os_update-desinfect.16 $@ }
 
-#tools_add_desinfect2016 [chroot_dir] [tools_list]
-function tools_add_desinfect2016() {
+#tools_add-desinfect.16 [chroot_dir] [tools_list]
+function tools_add-desinfect.16() {
   #$1 = chroot directory
   chroot_dir="$1"
   tools_list="$2"
 
   sourcelist_desinfect_set_extendet2016 "$chroot_dir"
-  tools_add "$chroot_dir" "$tools_list"
+  tools_add-debian "$chroot_dir" "$tools_list"
   sourcelist_desinfect_set_nomal2016 "$chroot_dir"
 }
+function tools_add() { tools_add-desinfect.16 $@ }

From 04e4e98525e64d165bd952d633336b2d652516de Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:05:32 +0200
Subject: [PATCH 43/55] semilicon fix

---
 src/proj/debian       |  8 ++++----
 src/proj/desinfect.15 | 12 ++++++------
 src/proj/desinfect.16 | 10 +++++-----
 src/proj/desinfect.17 |  6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/proj/debian b/src/proj/debian
index 5fe9c2b..196dbe2 100755
--- a/src/proj/debian
+++ b/src/proj/debian
@@ -24,7 +24,7 @@ function tools_add-debian() {
 	chroot "$chroot_dir" /bin/bash -c "apt-get install -y $tools_list" | grep -v "wird eingerichtet ..." | grep -v "Vormals nicht ausgewähltes Paket" | grep -v "Entpacken von" | grep -v "Holen: " | grep -v "Trigger für" | grep -v "update-alternatives:"
 	echo "done"
 }
-function tools_add() { tools_add-debian $@ }
+function tools_add() { tools_add-debian $@; }
 
 #os_update [chroot_dir]
 function os_update-debian() {
@@ -40,7 +40,7 @@ function os_update-debian() {
 
 	echo "done"
 }
-function os_update() { os_update-debian $@ }
+function os_update() { os_update-debian $@; }
 
 #proxy_enable [chroot_dir] [proxy_host] [proxy_port]
 function proxy_enable-debian() {
@@ -79,7 +79,7 @@ function proxy_enable-debian() {
     fi
   fi
 }
-function proxy_enable() { proxy_enable-debian $@ }
+function proxy_enable() { proxy_enable-debian $@; }
 
 #dns_set [chroot_dir] [domain] [nameserver]
 function dns_set-debian() {
@@ -95,4 +95,4 @@ function dns_set-debian() {
 
   echo "done"
 }
-function dns_set() { dns_set-debian $@ }
+function dns_set() { dns_set-debian $@; }
diff --git a/src/proj/desinfect.15 b/src/proj/desinfect.15
index 0bc0081..02302d7 100755
--- a/src/proj/desinfect.15
+++ b/src/proj/desinfect.15
@@ -26,7 +26,7 @@ function iso_create-desinfect.15() {
 
   iso_create-debian  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
 }
-function iso_create() { iso_create-desinfect.15 $@ }
+function iso_create() { iso_create-desinfect.15 $@; }
 
 #chroot_initial-desinfect.15 [chroot_dir]
 function chroot_initial-desinfect.15() {
@@ -50,7 +50,7 @@ function chroot_initial-desinfect.15() {
 
   echo "done"
 }
-function iso_create() { iso_create-desinfect.15 $@ }
+function iso_create() { iso_create-desinfect.15 $@; }
 
 #chroot_umount-desinfect.15 [chroot_dir]
 function chroot_umount-desinfect.15() {
@@ -76,7 +76,7 @@ function chroot_umount-desinfect.15() {
 
   echo "done"
 }
-function chroot_umount() { chroot_umount-desinfect.15 $@ }
+function chroot_umount() { chroot_umount-desinfect.15 $@; }
 
 #proxy_enable-desinfect.15 [chroot_dir] [proxy_host] [proxy_port]
 function proxy_enable-desinfect.15() {
@@ -108,7 +108,7 @@ function proxy_enable-desinfect.15() {
 
   echo "done"
 }
-function proxy_enable() { proxy_enable-desinfect.15 $@ }
+function proxy_enable() { proxy_enable-desinfect.15 $@; }
 
 #sourcelist_desinfect_set_nomal2015 [chroot_dir]
 function sourcelist_desinfect_set_nomal2015() {
@@ -212,7 +212,7 @@ function os_update-desinfect.15() {
 
   echo "done"
 }
-function os_update() { os_update-desinfect.15 $@ }
+function os_update() { os_update-desinfect.15 $@; }
 
 #tools_add-desinfect.15 [chroot_dir] [tools_list]
 function tools_add-desinfect.15() {
@@ -224,4 +224,4 @@ function tools_add-desinfect.15() {
   tools_add-debian "$chroot_dir" "$tools_list"
   sourcelist_desinfect_set_nomal2015 "$chroot_dir"
 }
-function tools_add() { tools_add-desinfect.15 $@ }
+function tools_add() { tools_add-desinfect.15 $@; }
diff --git a/src/proj/desinfect.16 b/src/proj/desinfect.16
index 03e8d60..89e5d5a 100755
--- a/src/proj/desinfect.16
+++ b/src/proj/desinfect.16
@@ -28,7 +28,7 @@ function chroot_initial-desinfect.16() {
 
   echo "done"
 }
-function chroot_initial() { chroot_initial-desinfect.16 $@ }
+function chroot_initial() { chroot_initial-desinfect.16 $@; }
 
 #chroot_umount-desinfect.16 [chroot_dir]
 function chroot_umount-desinfect.16() {
@@ -51,7 +51,7 @@ function chroot_umount-desinfect.16() {
 
   echo "done"
 }
-function chroot_umount() { chroot_umount-desinfect.16 $@ }
+function chroot_umount() { chroot_umount-desinfect.16 $@; }
 
 #proxy_enable-desinfect.16 [chroot_dir] [proxy_host] [proxy_port]
 function proxy_enable-desinfect.16() {
@@ -95,7 +95,7 @@ function proxy_enable-desinfect.16() {
 
   echo "done"
 }
-function proxy_enable() { proxy_enable-desinfect.16 $@ }
+function proxy_enable() { proxy_enable-desinfect.16 $@; }
 
 #sourcelist_desinfect_set_nomal2016 [chroot_dir]
 function sourcelist_desinfect_set_nomal2016() {
@@ -247,7 +247,7 @@ function os_update-desinfect.16() {
 
   echo "update virus definitions done"
 }
-function os_update() { os_update-desinfect.16 $@ }
+function os_update() { os_update-desinfect.16 $@; }
 
 #tools_add-desinfect.16 [chroot_dir] [tools_list]
 function tools_add-desinfect.16() {
@@ -259,4 +259,4 @@ function tools_add-desinfect.16() {
   tools_add-debian "$chroot_dir" "$tools_list"
   sourcelist_desinfect_set_nomal2016 "$chroot_dir"
 }
-function tools_add() { tools_add-desinfect.16 $@ }
+function tools_add() { tools_add-desinfect.16 $@; }
diff --git a/src/proj/desinfect.17 b/src/proj/desinfect.17
index e4085da..18c99f3 100755
--- a/src/proj/desinfect.17
+++ b/src/proj/desinfect.17
@@ -162,7 +162,7 @@ function os_update-desinfect.17() {
 
   echo "update virus definitions done"
 }
-function os_update() { os_update-desinfect.17 $@ }
+function os_update() { os_update-desinfect.17 $@; }
 
 #proxy_enable-desinfect.17 [chroot_dir] [proxy_host] [proxy_port]
 function proxy_enable-desinfect.17() {
@@ -237,7 +237,7 @@ function proxy_enable-desinfect.17() {
 
   echo "done"
 }
-function proxy_enable() { proxy_enable-desinfect.17 $@ }
+function proxy_enable() { proxy_enable-desinfect.17 $@; }
 
 #tools_add-desinfect.17 [chroot_dir] [tools_list]
 function tools_add-desinfect.17() {
@@ -249,4 +249,4 @@ function tools_add-desinfect.17() {
   tools_add-debian "$chroot_dir" "$tools_list"
   sourcelist_desinfect_set_nomal2017 "$chroot_dir"
 }
-function tools_add() { tools_add-desinfect.17 $@ }
+function tools_add() { tools_add-desinfect.17 $@; }

From 9b5cc1665d8d9ff7b7f4e19c528fe0508b490c5c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:14:21 +0200
Subject: [PATCH 44/55] use renew as base template

---
 src/config.sample.cfg |  3 ---
 src/remaster.sh       | 11 ++++-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/config.sample.cfg b/src/config.sample.cfg
index 21fd3e2..30cbfbb 100644
--- a/src/config.sample.cfg
+++ b/src/config.sample.cfg
@@ -4,9 +4,6 @@
 ## sample-config rename it to config.cfg after changes ##
 #########################################################
 
-## MODUS
-modus_default="update_pxe"
-
 #CD/DVD
 #entweder iso_source oder squashfs_path alls quelle
 # -> bei iso gen erforderlich!
diff --git a/src/remaster.sh b/src/remaster.sh
index 39e6228..5992b24 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -565,11 +565,8 @@ source <LIBDIR>/func/chroot_sh
 source <LIBDIR>/proj/desinfect.17
 ####################################
 
-### Handle Parameters & Modes ###
-
+###########################################################
+################# P r o c e s s ... #######################
+###########################################################
 #wenn kein modus angegebnen: default modus
-if [ -z "$1" ]; then
-  main_$modus_default
-else
-  main_$1 $2 $3 $4 $5 $6 $7 $8 $9
-fi
+main_renew

From eb96f7a0e41be5bd7090a1f3a84090425380dd92 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:15:08 +0200
Subject: [PATCH 45/55] rm unused modes

---
 src/remaster.sh | 282 ------------------------------------------------
 1 file changed, 282 deletions(-)

diff --git a/src/remaster.sh b/src/remaster.sh
index 5992b24..ac587f4 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -209,288 +209,6 @@ function main_renew() {
   on_exit 0
 }
 
-#remaster.sh update_pxe
-function main_update_pxe() {
-
-  #Start LOG
-  tail -f "$log_file" --pid="$$" &
-
-  chroot_path="`mktemp -d`"
-
-  echo "Remaster LOG `date '+%Y-%m-%d'`" > "$log_file"
-  echo "MODE: update_pxe" >> "$log_file"
-  echo "HOST: `hostname`" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "### S e t t i n g s ###" >> "$log_file"
-  echo "#Filesystem (for pxe)"  >> "$log_file"
-  echo "squashfs_path=\"$squashfs_path\""
-  echo >> "$log_file"
-
-  echo "#Network" >> "$log_file"
-  echo "domain=\"$domain\"" >> "$log_file"
-  echo "nameserver=\"$nameserver\"" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "#remaster_script" >> "$log_file"
-  echo "project=\"$project\"" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "log_file=\"$log_file\""
-  echo "log_mail_aim=\"$log_mail_aim\""
-  echo "log_mail_subject=\"$log_mail_subject\""
-  echo ""
-
-  echo "#Sonstiges" >> "$log_file"
-  echo "tools_list=\"$tools_list\"" >> "$log_file"
-  echo $'\n' >> "$log_file"
-
-  echo "### Enviroment ###"
-  echo "chroot_path=\"$chroot_path\"" >> "$log_file"
-  #env >> "$log_file"
-  echo $'\n\n' >> "$log_file"
-
-  echo $'### R U N ... ###\n' >> "$log_file"
-
-  #1. Set and Check Enviroment
-  check_user >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  check_update >> "$log_file"
-
-  check_dependency >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  check_config >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 1. Entpacken der Dateien des Live-Systems
-  [ -e "$squashfs_path" ] || {
-    echo "### ERROR ### \"$squashfs_path\" does not exist!" >> "$log_file"
-    on_exit 15 >> "$log_file"
-  }
-
-  filesystem_extract "$squashfs_path" "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 2. Vorbereiten für chroot-Umgebung:
-
-  chroot_initial "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 3. Setzen der Netzwerk-Einstellungen:
-
-  dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 4. Updaten von Desinfec't:
-  os_update "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 5. Manuelle Aktionen - deaktiviert
-
-  echo "Now You Have TIME to do something MANUALY!"
-  #echo "enter in shell:
-  chroot $chroot_path /bin/bash
-  #echo "Are You Finisch? Then Press [ENTER]"
-  #read
-
-  # 6. Umount - Chroot Umgebung auflösen
-
-  chroot_umount "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  #Überprüfen ob alles ausgehängt wurde
-  [ "`chroot_is_mounted "$chroot_path"`" == "true" ] && {
-    echo "### ERROR ### Cant Unmount Chroot!" >> "$log_file"
-    on_exit 21 >> "$log_file"
-  }
-
-  # 5. Packen und Ersetzen der Dateien
-  rm "$squashfs_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  filesystem_pack "$chroot_path"  "$squashfs_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  chmod 777 "$squashfs_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  workspace_erase "$chroot_path/" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-
-  on_exit 0
-}
-
-#remaster.sh update_iso #in arbeit
-function main_update_iso() {
-  #Start LOG
-  tail -f "$log_file" --pid="$$" &
-
-  chroot_path="`mktemp -d`"
-  iso_extr_dir="`mktemp -d`"
-
-  echo "Remaster LOG `date '+%Y-%m-%d'`" > "$log_file"
-  echo "MODE: update_iso" >> "$log_file"
-  echo "HOST: `hostname`" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "### S e t t i n g s ###" >> "$log_file"
-  echo "#CD/DVD" >> "$log_file"
-  echo "iso_source=\"$iso_source\"" >> "$log_file"
-  echo "iso_aim=\"$iso_aim\"" >> "$log_file"
-  echo "iso_lable=\"$iso_lable\"" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "#Filesystem (for pxe)"  >> "$log_file"
-  echo "squashfs_path=\"$squashfs_path\""  >> "$log_file"
-  echo >> "$log_file"
-
-  echo "#Network" >> "$log_file"
-  echo "proxy_host=\"$proxy_host\"" >> "$log_file"
-  echo "proxy_port=\"$proxy_port\"" >> "$log_file"
-  echo "domain=\"$domain\"" >> "$log_file"
-  echo "nameserver=\"$nameserver\"" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "#remaster_script" >> "$log_file"
-  echo "project=\"$project\"" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "log_file=\"$log_file\""
-  echo "log_mail_aim=\"$log_mail_aim\""
-  echo "log_mail_subject=\"$log_mail_subject\""
-  echo ""
-
-  echo "#Sonstiges" >> "$log_file"
-  echo "tools_list=\"$tools_list\"" >> "$log_file"
-  echo $'\n' >> "$log_file"
-
-  echo "### Enviroment ###"
-  echo "iso_extr_dir=\"$iso_extr_dir\"" >> "$log_file"
-  echo "chroot_path=\"$chroot_path\"" >> "$log_file"
-  #env >> "$log_file"
-  echo $'\n\n' >> "$log_file"
-
-  echo $'### R U N ... ###\n' >> "$log_file"
-
-  #1. Set and Check Enviroment
-  check_user >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  check_update >> "$log_file"
-
-  check_dependency >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  check_config >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 2. Entpacke ISO
-  iso_extract "$iso_source" "$iso_extr_dir"  >> "$log_file"
-
-  # 3. Checke pxe version
-  # if pxe is set
-  # 	if (date != date ); then $0 update_pxe 		#4.1
-  #		filesystem = update												#4.2
-  # else
-  #  	extrakt filesystem												#5.
-  #		update																		#6.
-  # done
-  # pack iso
-
-  # 3. Entpacken der Dateien des Live-Systems
-  filesystem_img="`find  "$iso_extr_dir" -name filesystem.squashfs`"
-  [ -e "$filesystem_img" ] || {
-    echo "### ERROR ### Image \"$iso_source\" has no \"filesystem.squashfs\"" >> "$log_file"
-    on_exit 15 >> "$log_file"
-  }
-
-  filesystem_extract "$filesystem_img" "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 4. Vorbereiten für chroot-Umgebung:
-
-  chroot_initial "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 5. Setzen der Netzwerk-Einstellungen:
-  [ -n "$proxy_host" ] && {
-    proxy_enable "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
-    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-  }
-
-  dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 6. Updaten von Desinfec't:
-  os_update "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 7. Installation optionaler Tools:
-
-  tools_add "$chroot_path" "$tools_list" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  #addo ClamAV to conky_info
-  sed -i 's/# ${color white}ClamAV/ ${color white}ClamAV/g'  "$chroot_path/etc/skel/.conkyrc"
-
-  chroot_clean "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 8. Manuelle Aktionen - deaktiviert
-
-  #echo "Now You Have TIME to do something MANUALY!"
-  #echo "enter in shell: #> chroot $chroot_path /bin/bash"
-  #chroot $chroot_path /bin/bash
-  #echo "Are You Finisch? Then Press [ENTER]"
-
-  # 9. Umount - Chroot Umgebung auflösen
-
-  chroot_umount "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  #Überprüfen ob alles ausgehängt wurde
-  [ "`chroot_is_mounted "$chroot_path"`" == "true" ] && {
-    echo "### ERROR ### Cant Unmount Chroot!" >> "$log_file"
-    on_exit 21 >> "$log_file"
-  }
-
-  # 10. Packen und Ersetzen der Dateien des Live-Systems
-  rm "$filesystem_img" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  filesystem_pack "$chroot_path"  "$filesystem_img" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # wenn iso gewünscht
-  [ "$iso_aim" != "" ] && {
-    iso_create "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
-    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-  }
-
-  # wenn filesystem gewünscht
-  [ "$squashfs_path" != "" ] && {
-    #wen bereits forhanden dann löschen
-    [ -f "$squashfs_path" ] && rm "$squashfs_path"
-    cp "$filesystem_img" "$squashfs_path" >> "$log_file"
-    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-    chmod 666 "$squashfs_path"
-    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-  }
-
-  chmod 666 "$iso_aim" "$filesystem_img" >> "$log_file"
-
-  #11. End
-  workspace_erase "$iso_extr_dir/" "$chroot_path/" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-
-  on_exit 0
-}
-
 #####################################################################################
 ################## F u n c t i o n s ################################################
 #####################################################################################

From 756d389c6dbd100c2b61ba65fc5211f96d210132 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:16:14 +0200
Subject: [PATCH 46/55] mv renew position

---
 src/remaster.sh | 327 +++++++++++++++++++++++-------------------------
 1 file changed, 159 insertions(+), 168 deletions(-)

diff --git a/src/remaster.sh b/src/remaster.sh
index ac587f4..e4fe7b1 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -43,172 +43,6 @@ fi
   fi
 }
 
-#####################################################################################
-################## M o d e s ########################################################
-#####################################################################################
-
-#remaster.sh renew
-function main_renew() {
-  #Start LOG
-  tail -f "$log_file" --pid="$$" &
-
-  chroot_path="`mktemp -d`"
-  iso_extr_dir="`mktemp -d`"
-
-  echo "Remaster LOG `date '+%Y-%m-%d'`" > "$log_file"
-  echo "MODE: renew" >> "$log_file"
-  echo "HOST: `hostname`" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "### S e t t i n g s ###" >> "$log_file"
-  echo "#CD/DVD" >> "$log_file"
-  echo "iso_source=\"$iso_source\"" >> "$log_file"
-  echo "iso_aim=\"$iso_aim\"" >> "$log_file"
-  echo "iso_lable=\"$iso_lable\"" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "#Filesystem (for pxe)"  >> "$log_file"
-  echo "squashfs_path=\"$squashfs_path\""  >> "$log_file"
-  echo >> "$log_file"
-
-  echo "#Network" >> "$log_file"
-  echo "proxy_host=\"$proxy_host\"" >> "$log_file"
-  echo "proxy_port=\"$proxy_port\"" >> "$log_file"
-  echo "domain=\"$domain\"" >> "$log_file"
-  echo "nameserver=\"$nameserver\"" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "#remaster_script" >> "$log_file"
-  echo "project=\"$project\"" >> "$log_file"
-  echo >> "$log_file"
-
-  echo "log_file=\"$log_file\""
-  echo "log_mail_aim=\"$log_mail_aim\""
-  echo "log_mail_subject=\"$log_mail_subj >> "$log_file"ect\""
-  echo ""
-
-  echo "#Sonstiges" >> "$log_file"
-  echo "tools_list=\"$tools_list\"" >> "$log_file"
-  echo $'\n' >> "$log_file"
-
-  echo "### Enviroment ###"
-  echo "iso_extr_dir=\"$iso_extr_dir\"" >> "$log_file"
-  echo "chroot_path=\"$chroot_path\"" >> "$log_file"
-  #env >> "$log_file"
-  echo $'\n\n' >> "$log_file"
-
-  echo $'### R U N ... ###\n' >> "$log_file"
-
-  #1. Set and Check Enviroment
-  check_user >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  check_dependency >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  check_config >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  check_update >> "$log_file"
-
-  # 2. Entpacke ISO
-  iso_extract "$iso_source" "$iso_extr_dir"  >> "$log_file"
-
-  # 3. Entpacken der Dateien des Live-Systems
-  filesystem_img="`find  "$iso_extr_dir" -name filesystem.squashfs`"
-  [ -e "$filesystem_img" ] || {
-    echo "### ERROR ### Image \"$iso_source\" has no \"filesystem.squashfs\"" >> "$log_file"
-    on_exit 15 >> "$log_file"
-  }
-
-  filesystem_extract "$filesystem_img" "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 4. Vorbereiten für chroot-Umgebung:
-
-  chroot_initial "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 5. Setzen der Netzwerk-Einstellungen:
-  [ -n "$proxy_host" ] && {
-    proxy_enable "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
-    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-  }
-
-  dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 6. Updaten von Desinfec't:
-  os_update "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 7. Installation optionaler Tools:
-
-  tools_add "$chroot_path" "$tools_list" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  #addo ClamAV to conky_info
-  sed -i 's/# ${color white}ClamAV/ ${color white}ClamAV/g'  "$chroot_path/etc/skel/.conkyrc"
-
-  chroot_clean "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # 8. Manuelle Aktionen - deaktiviert
-
-  #echo "Now You Have TIME to do something MANUALY!"
-  #echo "enter in shell: #> chroot $chroot_path /bin/bash"
-  #chroot $chroot_path /bin/bash
-  #echo "Are You Finisch? Then Press [ENTER]"
-
-  #config xrdp to start xfce
-  echo '#!/bin/sh' > "$chroot_path"/etc/xrdp/startwm.sh
-  echo "export LANG=\"de_DE.UTF-8\"" >> "$chroot_path"/etc/xrdp/startwm.sh
-  echo "startxfce4" >> "$chroot_path"/etc/xrdp/startwm.sh
-
-  # 9. Umount - Chroot Umgebung auflösen
-
-  chroot_umount "$chroot_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  #Überprüfen ob alles ausgehängt wurde
-  [ "`chroot_is_mounted "$chroot_path"`" == "true" ] && {
-    echo "### ERROR ### Cant Unmount Chroot!" >> "$log_file"
-    on_exit 21 >> "$log_file"
-  }
-
-  # 10. Packen und Ersetzen der Dateien des Live-Systems
-  rm "$filesystem_img" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  filesystem_pack "$chroot_path"  "$filesystem_img" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-  # wenn iso gewünscht
-  [ "$iso_aim" != "" ] && {
-    iso_create "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
-    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-  }
-
-  # wenn filesystem gewünscht
-  [ "$squashfs_path" != "" ] && {
-    #wen bereits forhanden dann löschen
-    [ -f "$squashfs_path" ] && rm "$squashfs_path"
-    cp "$filesystem_img" "$squashfs_path" >> "$log_file"
-    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-    chmod 666 "$squashfs_path"
-    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-  }
-
-  chmod 666 "$iso_aim" "$filesystem_img" >> "$log_file"
-
-  workspace_erase "$iso_extr_dir/" "$chroot_path/" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-
-
-  on_exit 0
-}
-
 #####################################################################################
 ################## F u n c t i o n s ################################################
 #####################################################################################
@@ -286,5 +120,162 @@ source <LIBDIR>/proj/desinfect.17
 ###########################################################
 ################# P r o c e s s ... #######################
 ###########################################################
-#wenn kein modus angegebnen: default modus
-main_renew
+
+#Start LOG
+tail -f "$log_file" --pid="$$" &
+
+chroot_path="`mktemp -d`"
+iso_extr_dir="`mktemp -d`"
+
+echo "Remaster LOG `date '+%Y-%m-%d'`" > "$log_file"
+echo "MODE: renew" >> "$log_file"
+echo "HOST: `hostname`" >> "$log_file"
+echo >> "$log_file"
+
+echo "### S e t t i n g s ###" >> "$log_file"
+echo "#CD/DVD" >> "$log_file"
+echo "iso_source=\"$iso_source\"" >> "$log_file"
+echo "iso_aim=\"$iso_aim\"" >> "$log_file"
+echo "iso_lable=\"$iso_lable\"" >> "$log_file"
+echo >> "$log_file"
+
+echo "#Filesystem (for pxe)"  >> "$log_file"
+echo "squashfs_path=\"$squashfs_path\""  >> "$log_file"
+echo >> "$log_file"
+
+echo "#Network" >> "$log_file"
+echo "proxy_host=\"$proxy_host\"" >> "$log_file"
+echo "proxy_port=\"$proxy_port\"" >> "$log_file"
+echo "domain=\"$domain\"" >> "$log_file"
+echo "nameserver=\"$nameserver\"" >> "$log_file"
+echo >> "$log_file"
+
+echo "#remaster_script" >> "$log_file"
+echo "project=\"$project\"" >> "$log_file"
+echo >> "$log_file"
+
+echo "log_file=\"$log_file\""
+echo "log_mail_aim=\"$log_mail_aim\""
+echo "log_mail_subject=\"$log_mail_subj >> "$log_file"ect\""
+echo ""
+
+echo "#Sonstiges" >> "$log_file"
+echo "tools_list=\"$tools_list\"" >> "$log_file"
+echo $'\n' >> "$log_file"
+
+echo "### Enviroment ###"
+echo "iso_extr_dir=\"$iso_extr_dir\"" >> "$log_file"
+echo "chroot_path=\"$chroot_path\"" >> "$log_file"
+#env >> "$log_file"
+echo $'\n\n' >> "$log_file"
+
+echo $'### R U N ... ###\n' >> "$log_file"
+
+#1. Set and Check Enviroment
+check_user >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+check_dependency >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+check_config >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+check_update >> "$log_file"
+
+# 2. Entpacke ISO
+iso_extract "$iso_source" "$iso_extr_dir"  >> "$log_file"
+
+# 3. Entpacken der Dateien des Live-Systems
+filesystem_img="`find  "$iso_extr_dir" -name filesystem.squashfs`"
+[ -e "$filesystem_img" ] || {
+  echo "### ERROR ### Image \"$iso_source\" has no \"filesystem.squashfs\"" >> "$log_file"
+  on_exit 15 >> "$log_file"
+}
+
+filesystem_extract "$filesystem_img" "$chroot_path" >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+# 4. Vorbereiten für chroot-Umgebung:
+
+chroot_initial "$chroot_path" >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+# 5. Setzen der Netzwerk-Einstellungen:
+[ -n "$proxy_host" ] && {
+  proxy_enable "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
+  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+}
+
+dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+# 6. Updaten von Desinfec't:
+os_update "$chroot_path" >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+# 7. Installation optionaler Tools:
+
+tools_add "$chroot_path" "$tools_list" >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+#addo ClamAV to conky_info
+sed -i 's/# ${color white}ClamAV/ ${color white}ClamAV/g'  "$chroot_path/etc/skel/.conkyrc"
+
+chroot_clean "$chroot_path" >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+# 8. Manuelle Aktionen - deaktiviert
+
+#echo "Now You Have TIME to do something MANUALY!"
+#echo "enter in shell: #> chroot $chroot_path /bin/bash"
+#chroot $chroot_path /bin/bash
+#echo "Are You Finisch? Then Press [ENTER]"
+
+#config xrdp to start xfce
+echo '#!/bin/sh' > "$chroot_path"/etc/xrdp/startwm.sh
+echo "export LANG=\"de_DE.UTF-8\"" >> "$chroot_path"/etc/xrdp/startwm.sh
+echo "startxfce4" >> "$chroot_path"/etc/xrdp/startwm.sh
+
+# 9. Umount - Chroot Umgebung auflösen
+
+chroot_umount "$chroot_path" >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+#Überprüfen ob alles ausgehängt wurde
+[ "`chroot_is_mounted "$chroot_path"`" == "true" ] && {
+  echo "### ERROR ### Cant Unmount Chroot!" >> "$log_file"
+  on_exit 21 >> "$log_file"
+}
+
+# 10. Packen und Ersetzen der Dateien des Live-Systems
+rm "$filesystem_img" >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+filesystem_pack "$chroot_path"  "$filesystem_img" >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+# wenn iso gewünscht
+[ "$iso_aim" != "" ] && {
+  iso_create "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
+  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+}
+
+# wenn filesystem gewünscht
+[ "$squashfs_path" != "" ] && {
+  #wen bereits forhanden dann löschen
+  [ -f "$squashfs_path" ] && rm "$squashfs_path"
+  cp "$filesystem_img" "$squashfs_path" >> "$log_file"
+  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+  chmod 666 "$squashfs_path"
+  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+}
+
+chmod 666 "$iso_aim" "$filesystem_img" >> "$log_file"
+
+workspace_erase "$iso_extr_dir/" "$chroot_path/" >> "$log_file"
+error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
+
+on_exit 0

From cd15118bb8d3ee8a1ea60280c42bc81979da12cc Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:17:02 +0200
Subject: [PATCH 47/55] beautysh -f src/remaster.sh

---
 src/remaster.sh | 72 ++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/remaster.sh b/src/remaster.sh
index e4fe7b1..5230919 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -10,37 +10,37 @@
 
 #set functions
 [ -d "<LIBDIR>" ] || {
-  echo "ERROR Librarys not found"
-  exit 1
+    echo "ERROR Librarys not found"
+    exit 1
 }
 
 #read main setting
 if [ -f "<ROOTDIR>/etc/remaster/config.cfg" ]; then
-  source "<ROOTDIR>/etc/remaster/config.cfg"
+    source "<ROOTDIR>/etc/remaster/config.cfg"
 else
-  if [ -f "<ROOTDIR>/etc/remaster/config.sample.cfg" ]; then
-    source "<ROOTDIR>/etc/remaster/config.sample.cfg"
-  else
-    echo "ERROR config not found"
-    exit 1
-  fi
+    if [ -f "<ROOTDIR>/etc/remaster/config.sample.cfg" ]; then
+        source "<ROOTDIR>/etc/remaster/config.sample.cfg"
+    else
+        echo "ERROR config not found"
+        exit 1
+    fi
 fi
 #check LOG
 {
-  [ -z "$log_file" ] && log_file="/tmp/remaster_`date '+%Y-%m-%d'`"
+    [ -z "$log_file" ] && log_file="/tmp/remaster_`date '+%Y-%m-%d'`"
 
-  if [ -f "$log_file" ]; then
-    echo > "$log_file"
-  else
-    #check if folder exist
-    [ -d "${log_file%/*}" ] || {
-        # N-> exit 3
-        echo "Directory for Log didnt exist"
-        exit 3
-    }
-    #create LOG
-    touch "$log_file"
-  fi
+    if [ -f "$log_file" ]; then
+        echo > "$log_file"
+    else
+        #check if folder exist
+        [ -d "${log_file%/*}" ] || {
+            # N-> exit 3
+            echo "Directory for Log didnt exist"
+            exit 3
+        }
+        #create LOG
+        touch "$log_file"
+    fi
 }
 
 #####################################################################################
@@ -189,8 +189,8 @@ iso_extract "$iso_source" "$iso_extr_dir"  >> "$log_file"
 # 3. Entpacken der Dateien des Live-Systems
 filesystem_img="`find  "$iso_extr_dir" -name filesystem.squashfs`"
 [ -e "$filesystem_img" ] || {
-  echo "### ERROR ### Image \"$iso_source\" has no \"filesystem.squashfs\"" >> "$log_file"
-  on_exit 15 >> "$log_file"
+    echo "### ERROR ### Image \"$iso_source\" has no \"filesystem.squashfs\"" >> "$log_file"
+    on_exit 15 >> "$log_file"
 }
 
 filesystem_extract "$filesystem_img" "$chroot_path" >> "$log_file"
@@ -203,8 +203,8 @@ error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_fil
 
 # 5. Setzen der Netzwerk-Einstellungen:
 [ -n "$proxy_host" ] && {
-  proxy_enable "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+    proxy_enable "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
+    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 }
 
 dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
@@ -244,8 +244,8 @@ error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_fil
 
 #Überprüfen ob alles ausgehängt wurde
 [ "`chroot_is_mounted "$chroot_path"`" == "true" ] && {
-  echo "### ERROR ### Cant Unmount Chroot!" >> "$log_file"
-  on_exit 21 >> "$log_file"
+    echo "### ERROR ### Cant Unmount Chroot!" >> "$log_file"
+    on_exit 21 >> "$log_file"
 }
 
 # 10. Packen und Ersetzen der Dateien des Live-Systems
@@ -257,19 +257,19 @@ error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_fil
 
 # wenn iso gewünscht
 [ "$iso_aim" != "" ] && {
-  iso_create "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+    iso_create "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable" >> "$log_file"
+    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 }
 
 # wenn filesystem gewünscht
 [ "$squashfs_path" != "" ] && {
-  #wen bereits forhanden dann löschen
-  [ -f "$squashfs_path" ] && rm "$squashfs_path"
-  cp "$filesystem_img" "$squashfs_path" >> "$log_file"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+    #wen bereits forhanden dann löschen
+    [ -f "$squashfs_path" ] && rm "$squashfs_path"
+    cp "$filesystem_img" "$squashfs_path" >> "$log_file"
+    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
-  chmod 666 "$squashfs_path"
-  error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+    chmod 666 "$squashfs_path"
+    error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 }
 
 chmod 666 "$iso_aim" "$filesystem_img" >> "$log_file"

From f303797810a9161224ed2650208cbe4d7a026f96 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:20:55 +0200
Subject: [PATCH 48/55] add new base function

---
 src/proj/base | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/proj/base b/src/proj/base
index 6e03c0d..e33b145 100755
--- a/src/proj/base
+++ b/src/proj/base
@@ -28,3 +28,7 @@ function proxy_enable() {
 function dns_set() {
 	echo "$project: dns_set ot available"
 }
+
+function project_mods() {
+	echo "$project: project_mods ot available"
+}

From 23e39f21f6509e6448e72f5ec7755405aa55e81c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:25:13 +0200
Subject: [PATCH 49/55] readd proj mods

---
 src/proj/desinfect.17 | 11 +++++++++++
 src/remaster.sh       |  5 +----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/proj/desinfect.17 b/src/proj/desinfect.17
index 18c99f3..355e2e4 100755
--- a/src/proj/desinfect.17
+++ b/src/proj/desinfect.17
@@ -250,3 +250,14 @@ function tools_add-desinfect.17() {
   sourcelist_desinfect_set_nomal2017 "$chroot_dir"
 }
 function tools_add() { tools_add-desinfect.17 $@; }
+
+
+function project_mods-desinfect.17() {
+  #config xrdp to start xfce
+  [ -d "$chroot_path/etc/xrdp/" ] && {
+    echo '#!/bin/sh' > "$chroot_path"/etc/xrdp/startwm.sh
+    echo "export LANG=\"de_DE.UTF-8\"" >> "$chroot_path"/etc/xrdp/startwm.sh
+    echo "startxfce4" >> "$chroot_path"/etc/xrdp/startwm.sh
+  }
+}
+function project_mods() { project_mods-desinfect.17 $@; }
diff --git a/src/remaster.sh b/src/remaster.sh
index 5230919..a2e8e5c 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -232,10 +232,7 @@ error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_fil
 #chroot $chroot_path /bin/bash
 #echo "Are You Finisch? Then Press [ENTER]"
 
-#config xrdp to start xfce
-echo '#!/bin/sh' > "$chroot_path"/etc/xrdp/startwm.sh
-echo "export LANG=\"de_DE.UTF-8\"" >> "$chroot_path"/etc/xrdp/startwm.sh
-echo "startxfce4" >> "$chroot_path"/etc/xrdp/startwm.sh
+project_mods
 
 # 9. Umount - Chroot Umgebung auflösen
 

From 7d4c1015d58b9038a49ce926b55b80ac35721e34 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:30:35 +0200
Subject: [PATCH 50/55] switch checks

---
 src/func/iso_extract | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/func/iso_extract b/src/func/iso_extract
index ab6c6df..e5100f7 100755
--- a/src/func/iso_extract
+++ b/src/func/iso_extract
@@ -15,17 +15,18 @@ function iso_extract() {
 		return 10
 	}
 
+	iso_extr_dir="$2"
+	[ -d "$iso_extr_dir" ] || {
+		echo "### ERROR ### iso_extract: aim directory not exist!"
+		return 12
+	}
+
 	iso_source="$1"
 	[ -f "$iso_source" ] || {
 		echo "### ERROR ### iso_extract: ISO \"$iso_source\" not exist!"
 		return 11
 	}
 
-	iso_extr_dir="$2"
-	[ -d "$iso_extr_dir" ] || {
-		echo "### ERROR ### iso_extract: aim directory not exist!"
-		return 12
-	}
 
 	#mace tmp mountpoint
 	tmpdir="`mktemp -d`"

From 2a081ad5175e835ef079cc90043297b8de3950f0 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:34:32 +0200
Subject: [PATCH 51/55] add logic

---
 src/func/iso_extract | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/func/iso_extract b/src/func/iso_extract
index e5100f7..46a8432 100755
--- a/src/func/iso_extract
+++ b/src/func/iso_extract
@@ -21,10 +21,17 @@ function iso_extract() {
 		return 12
 	}
 
+	iso_source_is_url=false
 	iso_source="$1"
 	[ -f "$iso_source" ] || {
-		echo "### ERROR ### iso_extract: ISO \"$iso_source\" not exist!"
-		return 11
+		#if it is an url...
+		if [ url-exist ]; then
+			iso_source_is_url=true
+			#dl to tmp + set iso_source
+		else
+			echo "### ERROR ### iso_extract: ISO \"$iso_source\" not exist!"
+			return 11
+		fi
 	}
 
 
@@ -42,6 +49,7 @@ function iso_extract() {
 	#clear tmp mountpoint
 	umount "$iso_source"
 	rm -r "$tmpdir"
+	[ "$iso_source_is_url" == "true" ] && rm "$iso_source"
 	tmpdir=
 
 	echo "done"

From 05bf2a4cdf6d0abfeac3043b73bf081f37cca164 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:38:30 +0200
Subject: [PATCH 52/55] add new sub func

---
 src/func/check_url | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/func/check_url

diff --git a/src/func/check_url b/src/func/check_url
new file mode 100644
index 0000000..53b23e0
--- /dev/null
+++ b/src/func/check_url
@@ -0,0 +1,20 @@
+#!/bin/bash
+#remaster lib
+[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
+
+#check_url [URL]
+function check_url() {
+    URL="$1"
+    if [[ `wget -S --spider "$URL"  2>&1 | grep 'HTTP/1.1 200 OK'` ]]; then
+      echo "true"
+      return 0
+    else
+      echo "false"
+      return 1
+    fi
+}
+
+#this func is standalone executable
+[ -n "$1" ] && {
+    check_url $@
+}

From 32cfb2a7a43381d1ba45a106e95a2b62ea357f60 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:47:10 +0200
Subject: [PATCH 53/55] finish

---
 src/func/iso_extract | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/func/iso_extract b/src/func/iso_extract
index 46a8432..d89ff28 100755
--- a/src/func/iso_extract
+++ b/src/func/iso_extract
@@ -21,13 +21,13 @@ function iso_extract() {
 		return 12
 	}
 
-	iso_source_is_url=false
 	iso_source="$1"
 	[ -f "$iso_source" ] || {
 		#if it is an url...
-		if [ url-exist ]; then
-			iso_source_is_url=true
+		if [ "`check_url $iso_source`" == "true" ]; then
 			#dl to tmp + set iso_source
+			iso_tmp="`mktemp --suffix=.iso`"; rm "$iso_tmp"
+			wget -O "$iso_tmp" "$iso_source"
 		else
 			echo "### ERROR ### iso_extract: ISO \"$iso_source\" not exist!"
 			return 11
@@ -49,7 +49,7 @@ function iso_extract() {
 	#clear tmp mountpoint
 	umount "$iso_source"
 	rm -r "$tmpdir"
-	[ "$iso_source_is_url" == "true" ] && rm "$iso_source"
+	[ -n "$iso_tmp" ] && rm "$iso_tmp"
 	tmpdir=
 
 	echo "done"

From aa0e1fbd6da7ad120afaf9633754436790bd4d67 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 01:51:17 +0200
Subject: [PATCH 54/55] v 2.0.4

---
 DEBIAN/control      | 2 +-
 changes/remaster.md | 6 ++++++
 src/remaster.sh     | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/DEBIAN/control b/DEBIAN/control
index 132f7d0..0862434 100644
--- a/DEBIAN/control
+++ b/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: remaster
 Source: remaster
-Version: 2.0.3
+Version: 2.0.4
 Architecture: all
 Maintainer: 6543 <6543@obermui.de>
 Installed-Size: <SIZE>
diff --git a/changes/remaster.md b/changes/remaster.md
index d5f582d..7a6a57d 100644
--- a/changes/remaster.md
+++ b/changes/remaster.md
@@ -24,3 +24,9 @@
  * change Strukture.md
  * add config check
  * some help scripts
+
+2018-05-22 - 2.0.4
+ * add iso_source as URL
+ * restructure code
+ * use proj templates
+ * some help scripts
diff --git a/src/remaster.sh b/src/remaster.sh
index a2e8e5c..0d5558f 100755
--- a/src/remaster.sh
+++ b/src/remaster.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#@version 2.0.3
+#@version 2.0.4
 #@autor 6543@obermui.de
-#@date 2018-05-20
+#@date 2018-05-22
 #@licence GNUv3
 
 #####################################################################################

From de495758b48b2392d972ef11bf103ec9c2429e7c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 May 2018 02:19:04 +0200
Subject: [PATCH 55/55] del old proj for release

---
 src/proj/desinfect.15 | 227 ------------------------------------
 src/proj/desinfect.16 | 262 ------------------------------------------
 2 files changed, 489 deletions(-)
 delete mode 100755 src/proj/desinfect.15
 delete mode 100755 src/proj/desinfect.16

diff --git a/src/proj/desinfect.15 b/src/proj/desinfect.15
deleted file mode 100755
index 02302d7..0000000
--- a/src/proj/desinfect.15
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#desinfect.15
-# . -Y ubuntu.14.04 -> ubuntu -> debian
-source <LIBDIR>/proj/ubuntu.14.04
-project_relation="desinfect.15 $project_relation"
-
-
-
-#iso_create-desinfect.15 [chroot_path] [iso_extr_dir] [iso_aim] [iso_lable]
-function iso_create-desinfect.15() {
-  echo "prepere iso folder ... "
-
-  chroot_path="$1"
-  iso_extr_dir="$2"
-  iso_aim="$3"
-  iso_lable="$4"
-
-  #desinfect
-  rm "$iso_extr_dir/casper/initrd.lz"
-  wget http://www.heise.de/ct/projekte/desinfect/des15/initrd.lz -O "$iso_extr_dir/casper/initrd.lz"
-
-  echo "done"
-
-  iso_create-debian  "$chroot_path" "$iso_extr_dir" "$iso_aim" "$iso_lable"
-}
-function iso_create() { iso_create-desinfect.15 $@; }
-
-#chroot_initial-desinfect.15 [chroot_dir]
-function chroot_initial-desinfect.15() {
-  #$1 = chroot dir
-
-  chroot_initial-debian "$1"
-
-  echo -n "initial desinfect on chroot ... "
-
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_initial_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  #mount virus definitions
-  #bitdefender
-  mount --bind $chroot_dir/opt/BitDefender-scanner/var/lib/scan{.orig,}
-  mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
-
-  echo "done"
-}
-function iso_create() { iso_create-desinfect.15 $@; }
-
-#chroot_umount-desinfect.15 [chroot_dir]
-function chroot_umount-desinfect.15() {
-  #call main mount
-  chroot_umount-debian "$1"
-
-  echo -n "unmount desinfect on chroot ... "
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  for d in "$chroot_dir/opt/BitDefender-scanner/var/lib/scan" "$chroot_dir/var/kl/bases_rd" ; do
-    umount $d
-    retval=$?
-    [ "$retval" -gt 0 ] && {
-      echo "### ERROR ### chroot_umount_desinfect: can't umount \"$d\"!"
-      return 21
-    }
-  done
-
-  echo "done"
-}
-function chroot_umount() { chroot_umount-desinfect.15 $@; }
-
-#proxy_enable-desinfect.15 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable-desinfect.15() {
-
-  proxy_enable-debian $1 $2 $3
-
-  echo -n "enable proxy for desinfect's av ... "
-
-  chroot_dir="$1"
-  proxy_host="$2"
-  proxy_port="$3"
-
-  #Avast AntiVirus
-  sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-  sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-
-  #BitDefender
-  echo "ProxyEnable = Yes" >> "$chroot_dir/etc/BitDefender-scanner/bdscan.conf"
-  echo "ProxyHost = $proxy_host:$proxy_port" >> "$chroot_dir/etc/BitDefender-scanner/bdscan.conf"
-
-  #Clam AV
-  echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
-  echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
-
-  #Kaspersky
-  sed -i "s/<tDWORD name=\"UseProxy\">0<\/tDWORD>/<tDWORD name=\"UseProxy\">1<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tSTRING name=\"ProxyHost\"><\/tSTRING>/<tSTRING name=\"ProxyHost\">$proxy_host<\/tSTRING>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tDWORD name=\"ProxyPort\"><\/tDWORD>/<tDWORD name=\"ProxyPort\">$proxy_port<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-
-  echo "done"
-}
-function proxy_enable() { proxy_enable-desinfect.15 $@; }
-
-#sourcelist_desinfect_set_nomal2015 [chroot_dir]
-function sourcelist_desinfect_set_nomal2015() {
-  echo -n "build normal source.list ... "
-  #$1 = chroot directory
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2015 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2015 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "# #### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
-  echo "# deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#sourcelist_desinfect_set_extendet2015 [chroot_dir]
-function sourcelist_desinfect_set_extendet2015() {
-  echo -n "build extendet source.list ... "
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2015 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2015 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "#### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "## developers who want to ship their latest software." >> "$sourcelist"
-  echo "deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#os_update-desinfect.15 [chroot_dir]
-function os_update-desinfect.15() {
-  #$1 = chroot directory
-
-  chroot_dir="$1"
-
-  #call main os_update
-  os_update-debian "$chroot_dir"
-
-  echo "update virus definitions ... "
-
-  #BitDefender
-  chroot "$chroot_dir" /bin/bash -c "bdscan --update" | grep -v "... updated"
-
-  #Avast Avira
-  chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
-
-  #Clam AV
-  chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
-  rm -f "$chroot_dir/var/lib/clamav/daily.cld"
-
-  #Karspersky
-  echo '#!/bin/bash' > "$chroot_dir/tmp/up_kasp"
-  echo 'PATH=/usr/lib/kl:$PATH' >> "$chroot_dir/tmp/up_kasp"
-  echo 'LD_LIBRARY_PATH=/usr/lib/kl:$LD_LIBRARY_PATH' >> "$chroot_dir/tmp/up_kasp"
-  echo 'KL_PLUGINS_PATH=/usr/lib/kl' >> "$chroot_dir/tmp/up_kasp"
-  echo 'export PATH LD_LIBRARY_PATH KL_PLUGINS_PATH' >> "$chroot_dir/tmp/up_kasp"
-  echo '/usr/lib/kl/kav update' >> "$chroot_dir/tmp/up_kasp"
-  chmod +x  "$chroot_dir/tmp/up_kasp"
-  chroot "$chroot_dir" /bin/bash -c "/tmp/up_kasp" | grep -v ".kdc" | grep -v "File downloaded"
-  rm "$chroot_dir/tmp/up_kasp"
-
-
-  echo "done"
-}
-function os_update() { os_update-desinfect.15 $@; }
-
-#tools_add-desinfect.15 [chroot_dir] [tools_list]
-function tools_add-desinfect.15() {
-  #$1 = chroot directory
-  chroot_dir="$1"
-  tools_list="$2"
-
-  sourcelist_desinfect_set_extendet2015 "$chroot_dir"
-  tools_add-debian "$chroot_dir" "$tools_list"
-  sourcelist_desinfect_set_nomal2015 "$chroot_dir"
-}
-function tools_add() { tools_add-desinfect.15 $@; }
diff --git a/src/proj/desinfect.16 b/src/proj/desinfect.16
deleted file mode 100755
index 89e5d5a..0000000
--- a/src/proj/desinfect.16
+++ /dev/null
@@ -1,262 +0,0 @@
-#!/bin/bash
-#remaster lib
-[ -d "<LIBDIR>" ] || { echo "LIBDIR not exist"; exit 1; }
-
-#desinfect.16
-# . -Y ubuntu.14.04 -> ubuntu -> debian
-source <LIBDIR>/proj/ubuntu.14.04
-project_relation="desinfect.16 $project_relation"
-
-
-#chroot_initial-desinfect.16 [chroot_dir]
-function chroot_initial-desinfect.16() {
-  #$1 = chroot dir
-
-  chroot_initial-debian "$1"
-
-  echo -n "initial desinfect on chroot ... "
-
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_initial_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  #mount virus definitions
-  mount --bind $chroot_dir/var/kl/bases_rd{.orig,}
-
-  echo "done"
-}
-function chroot_initial() { chroot_initial-desinfect.16 $@; }
-
-#chroot_umount-desinfect.16 [chroot_dir]
-function chroot_umount-desinfect.16() {
-  #call main mount
-  chroot_umount-debian "$1"
-
-  echo -n "unmount desinfect on chroot ... "
-  #check chroot dir
-  chroot_dir="$1"
-  [ -d "$chroot_dir" ] || {
-    echo "### ERROR ### chroot_umount_desinfect: chroot directory not exist!"
-    return 12
-  }
-
-  umount "$chroot_dir/var/kl/bases_rd"
-  [ "$?" -gt 0 ] && {
-    echo "### ERROR ### chroot_umount_desinfect: can't umount \"$chroot_dir/var/kl/bases_rd\"!"
-    #return 21
-  }
-
-  echo "done"
-}
-function chroot_umount() { chroot_umount-desinfect.16 $@; }
-
-#proxy_enable-desinfect.16 [chroot_dir] [proxy_host] [proxy_port]
-function proxy_enable-desinfect.16() {
-
-  proxy_enable-debian $1 $2 $3
-
-  echo -n "enable proxy for desinfect's av ... "
-
-  chroot_dir="$1"
-  proxy_host="$2"
-  proxy_port="$3"
-  tmp_file_344532="`mktemp`"
-
-  #Avast AntiVirus
-  sed -i "s/--skip-master-file/--skip-master-file --proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-  sed -i "s/--proxy-host=$proxy_host --proxy-port=$proxy_port --proxy-host=$proxy_host --proxy-port=$proxy_port/--proxy-host=$proxy_host --proxy-port=$proxy_port/g" "$chroot_dir/AntiVirUpdate/avupdate"
-
-  #Clam AV
-  cat "$chroot_dir/etc/clamav/freshclam.conf" | grep -v "HTTPProxyServer" | grep -v "HTTPProxyPort" > "$tmp_file_344532"
-  rm "$chroot_dir/etc/clamav/freshclam.conf"
-  cp "$tmp_file_344532" "$chroot_dir/etc/clamav/freshclam.conf"
-
-  echo "HTTPProxyServer $proxy_host" >> "$chroot_dir/etc/clamav/freshclam.conf"
-  echo "HTTPProxyPort $proxy_port" >> "$chroot_dir/etc/clamav/freshclam.conf"
-
-  #Eset AV
-  cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "proxy_addr" | grep -v "proxy_port" > "$tmp_file_344532"
-  rm "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-  cp "$tmp_file_344532" "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-  echo "proxy_addr = \"$proxy_host\"" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-  echo "proxy_port = $proxy_port" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-  #Kaspersky
-  sed -i "s/<tDWORD name=\"UseProxy\">0<\/tDWORD>/<tDWORD name=\"UseProxy\">1<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tSTRING name=\"ProxyHost\"><\/tSTRING>/<tSTRING name=\"ProxyHost\">$proxy_host<\/tSTRING>/g" "$chroot_dir/etc/kl/config.xml"
-  sed -i "s/<tDWORD name=\"ProxyPort\"><\/tDWORD>/<tDWORD name=\"ProxyPort\">$proxy_port<\/tDWORD>/g" "$chroot_dir/etc/kl/config.xml"
-
-  rm "$tmp_file_344532"
-  tmp_file_344532=
-
-  echo "done"
-}
-function proxy_enable() { proxy_enable-desinfect.16 $@; }
-
-#sourcelist_desinfect_set_nomal2016 [chroot_dir]
-function sourcelist_desinfect_set_nomal2016() {
-  echo -n "build normal source.list ... "
-  #$1 = chroot directory
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2016 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2016 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "# #### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "# deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "#" >> "$sourcelist"
-  echo "# ## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "# ## developers who want to ship their latest software." >> "$sourcelist"
-  echo "# deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#sourcelist_desinfect_set_extendet2016 [chroot_dir]
-function sourcelist_desinfect_set_extendet2016() {
-  echo -n "build extendet source.list ... "
-
-  sourcelist="$1/etc/apt/sources.list"
-
-
-  echo "#### Desinfe't 2016 ####" > "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://www.heise.de/ct/projekte/desinfect/ubuntu 2016 main" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "#### Ubuntu 14.04 (trusty) ####" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "deb http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" >> "$sourcelist"
-  echo "" >> "$sourcelist"
-  echo "## This software is not part of Ubuntu, but is offered by third-party" >> "$sourcelist"
-  echo "## developers who want to ship their latest software." >> "$sourcelist"
-  echo "deb http://extras.ubuntu.com/ubuntu trusty main" >> "$sourcelist"
-
-  echo "done"
-}
-
-#os_update-desinfect.16 [chroot_dir]
-function os_update-desinfect.16() {
-  #$1 = chroot directory
-
-  chroot_dir="$1"
-
-  #call main os_update
-  os_update-debian "$chroot_dir"
-
-  echo "update virus definitions ... "
-
-  #Avast Avira
-  {
-    echo "Avira ..."
-    chroot "$chroot_dir" /bin/bash -c "/AntiVirUpdate/avupdate" | grep -v " -> "
-    echo "Avira done"
-  }
-
-  #Clam AV
-  {
-    echo "ClamAV..."
-    chroot "$chroot_dir" /bin/bash -c "freshclam" > /dev/null
-    rm -f "$chroot_dir/var/lib/clamav/daily.cld"
-    echo "ClamAV done"
-  }
-
-  #Eset AV
-  {
-    echo "Eset AV ..."
-    tmp_file_23421="`mktemp`"
-    cat "$chroot_dir/etc/opt/eset/esets/esets.cfg" | grep -v "av_update_username" | grep -v "av_update_password" > "$tmp_file_23421"
-    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-    chroot "$chroot_dir" /bin/bash -c "/usr/bin/esetrand" >> "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-    echo "set timeout: 2min"
-    av_eaet_timeout=1200
-    tmp_var_3092="`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`"
-
-    #eig. update routine
-    chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets restart"
-    sleep 2
-    chroot "$chroot_dir" /bin/bash -c "/opt/eset/esets/sbin/esets_daemon --update"
-
-    #warten auf daemon update ...
-    sleep 10m
-    echo "wait 10min for Eset AV update"
-    while [ "`chroot "$chroot_dir" /bin/bash -c "/opt/desinfect/conky_info.sh eset"`" == "$tmp_var_3092" ]; do
-      sleep 1
-      av_eaet_timeout=$((av_eaet_timeout-1))
-      [ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
-    done
-
-    sleep 4
-
-    chroot "$chroot_dir" /bin/bash -c "/etc/init.d/esets stop"
-
-    cat "$tmp_file_23421" > "$chroot_dir/etc/opt/eset/esets/esets.cfg"
-
-    rm "$tmp_file_23421"
-    tmp_file_23421=
-    tmp_var_3092=
-    echo "Eset AV done"
-  }
-
-  #Karspersky
-  {
-    echo "Karspersky ..."
-    #gen update-scrypt
-    echo '#!/bin/bash' > "$chroot_dir/tmp/up_kasp"
-    echo 'PATH=/usr/lib/kl:$PATH' >> "$chroot_dir/tmp/up_kasp"
-    echo 'LD_LIBRARY_PATH=/usr/lib/kl:$LD_LIBRARY_PATH' >> "$chroot_dir/tmp/up_kasp"
-    echo 'KL_PLUGINS_PATH=/usr/lib/kl' >> "$chroot_dir/tmp/up_kasp"
-    echo 'export PATH LD_LIBRARY_PATH KL_PLUGINS_PATH' >> "$chroot_dir/tmp/up_kasp"
-    echo '/usr/lib/kl/kav update' >> "$chroot_dir/tmp/up_kasp"
-    chmod +x  "$chroot_dir/tmp/up_kasp"
-
-    chroot "$chroot_dir" /bin/bash -c "/tmp/up_kasp" | grep -v ".kdc" | grep -v "File downloaded"
-    rm "$chroot_dir/tmp/up_kasp"
-    echo "Karspersky done"
-  }
-
-  echo "update virus definitions done"
-}
-function os_update() { os_update-desinfect.16 $@; }
-
-#tools_add-desinfect.16 [chroot_dir] [tools_list]
-function tools_add-desinfect.16() {
-  #$1 = chroot directory
-  chroot_dir="$1"
-  tools_list="$2"
-
-  sourcelist_desinfect_set_extendet2016 "$chroot_dir"
-  tools_add-debian "$chroot_dir" "$tools_list"
-  sourcelist_desinfect_set_nomal2016 "$chroot_dir"
-}
-function tools_add() { tools_add-desinfect.16 $@; }