v1.7.3

remaster.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-#@version 1.7.1
+#@version 1.7.3
 #@autor Martin.Huber@obermui.de
-#@date 2017-06-19
+#@date 2017-06-20
 
 #####################################################################################
 ################## S e t t i n g s ##################################################
@@ -39,13 +39,14 @@ log_mail_aim="6543@email.clocal"
 log_mail_subject="Desinfect_Remaster"
 
 #Sonstiges
-tools_list="clamav nano htop nmon iftop tmux dsniff nmap openssh-server tightvncserver rsync e2fsprogs foremost gddrescue recoverjpeg safecopy sleuthkit testdisk arp-scan apt-transport-https"
+tools_list="clamav nano htop nmon iftop tmux dsniff nmap openssh-server tightvncserver rsync e2fsprogs foremost gddrescue recoverjpeg safecopy sleuthkit testdisk arp-scan"
 
 
 #####################################################################################
 ################## M o d e s ########################################################
 #####################################################################################
 
+#remaster.sh renew
 function main_renew() {
 
 	[ -f "$log_file" ] || touch "$log_file"
@@ -98,11 +99,12 @@ function main_renew() {
 
 	echo $'### R U N ... ###\n' >> "$log_file"
 
-	#check root
+	#1. Set and Check Enviroment
-	[ "`whoami`" == "root" ] || {
+	check_user
-	  echo "### ERROR ### Remaster need ROOT permision!" >> "$log_file"
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-	  on_exit 10 >> "$log_file"
+
-	}
+	check_dependency
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
 	[ "$distro" != "" ] && distro="_$distro"
 
@@ -198,6 +200,7 @@ function main_renew() {
 	on_exit 0
 }
 
+#remaster.sh update
 function main_update() {
 
 	[ "$log_file" == "" ] && log_file="`mktemp`"
@@ -241,11 +244,12 @@ function main_update() {
 
 	echo $'### R U N ... ###\n' >> "$log_file"
 
-	#check root
+	#1. Set and Check Enviroment
-	[ "`whoami`" == "root" ] || {
+	check_user
-	  echo "### ERROR ### Remaster need ROOT permision!" >> "$log_file"
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-	  on_exit 10 >> "$log_file"
+
-	}
+	check_dependency
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
 	[ "$distro" != "" ] && distro="_$distro"
 
@@ -307,6 +311,7 @@ function main_update() {
 	on_exit 0
 }
 
+#remaster.sh renew_test
 function main_renew_test() {
 
 	[ -f "$log_file" ] || touch "$log_file"
@@ -359,11 +364,12 @@ function main_renew_test() {
 
 	echo $'### R U N ... ###\n' >> "$log_file"
 
-	#check root
+	#1. Set and Check Enviroment
-	[ "`whoami`" == "root" ] || {
+	check_user
-	  echo "### ERROR ### Remaster need ROOT permision!" >> "$log_file"
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-	  on_exit 10 >> "$log_file"
+
-	}
+	check_dependency
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
 	[ "$distro" != "" ] && distro="_$distro"
 
@@ -459,6 +465,7 @@ function main_renew_test() {
 	on_exit 0
 }
 
+#remaster.sh update_test
 function main_update_test() {
 
 	[ "$log_file" == "" ] && log_file="`mktemp`"
@@ -502,11 +509,12 @@ function main_update_test() {
 
 	echo $'### R U N ... ###\n' >> "$log_file"
 
-	#check root
+	#1. Set and Check Enviroment
-	[ "`whoami`" == "root" ] || {
+	check_user
-	  echo "### ERROR ### Remaster need ROOT permision!" >> "$log_file"
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
-	  on_exit 10 >> "$log_file"
+
-	}
+	check_dependency
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
 	[ "$distro" != "" ] && distro="_$distro"
 
@@ -533,6 +541,9 @@ function main_update_test() {
 	os_update$distro "$chroot_path" >> "$log_file"
 	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
 
+	tools_add$distro "$chroot_path" "$tools_list"
+	error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
+
 	# 5. Manuelle Aktionen - deaktiviert
 
 	#echo "Now You Have TIME to do something MANUALY!"
@@ -568,6 +579,10 @@ function main_update_test() {
 	on_exit 0
 }
 
+#remaster.sh error_code [error_level]
+function main_error_code() {
+	error_code $1
+}
 
 #####################################################################################
 ################## F u n c t i o n s ################################################
@@ -608,7 +623,7 @@ function error_code() {
   	"")
 			echo $'ID:\tDescription\n----------------------------------------------------\n1\tAllgemeiner Fehler\n2\tNo Paramters / wrong parameters'
 			echo $'3\tWrong Settings\n4\tProgramm missing\n\n10\tno root\n11\tfile no found\n12\tdir not found\n13\tcant create/delete file/dir'
-			echo $'14\tcorrupt file (unsquashfs, mount iso, ...)\n15\twrong file (iso has no squashfs-file ...)\n\n20\tmount error\n21\tunmoun error\n22\twrong filesystem'
+			echo $'14\tcorrupt file (unsquashfs, mount iso, ...)\n15\twrong file (iso has no squashfs-file ...)\n16\trequired Packet not found\n\n20\tmount error\n21\tunmoun error\n22\twrong filesystem'
 			;;
 		1)
 			echo "Allgemeiner Fehler"
@@ -640,6 +655,9 @@ function error_code() {
   	15)
   		echo "wrong file (iso has no squashfs-file ...)"
   		;;
+		16)
+			echo "required Packet not found"
+			;;
   	20)
   		echo "tmount error"
   		;;
@@ -655,6 +673,27 @@ function error_code() {
 	esac
 }
 
+#check_user
+function check_user() {
+	#check root
+	[ "`whoami`" == "root" ] || {
+		echo "### ERROR ### Remaster need ROOT permision!"
+		return 10
+	}
+}
+
+#check_dependency
+function check_dependency() {
+	for packet in squashfs-tools xorriso wget sed sendemail; do
+		[ "`dpkg -l $packet 2>&1`" == "dpkg-query: Kein Paket gefunden, das auf $packet passt" ] && {
+			echo "### ERROR ### Packet $packet not installed"
+			return 16
+		}
+	done
+	return 0
+}
+
+
 ### Workspace ###
 
 #workspace_erase [workspace_path]
@@ -1616,21 +1655,20 @@ function os_update_desinfect2017() {
 		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"
+		echo "set timeout: 5min"
-		av_eaet_timeout=1200
+		av_eaet_timeout=300
 		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"
+		chroot "$chroot_dir" /bin/bash --login -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
+			sleep 10
-			av_eaet_timeout=$((av_eaet_timeout-1))
+			av_eaet_timeout=$((av_eaet_timeout-10))
 			[ $av_eaet_timeout -gt 0 ] || tmp_var_3092=
 		done
 
@@ -1649,7 +1687,7 @@ function os_update_desinfect2017() {
 	#Sophos
 	{
 		echo "Sophos..."
-		chroot "$chroot_dir" /bin/bash -c "/opt/sophos-av/bin/savupdate -v3"
+		chroot "$chroot_dir" /bin/bash --login -c "/opt/sophos-av/bin/savupdate -v3"
 		#chroot "$chroot_dir" /bin/bash -c "/opt/sophos-av/bin/savupdate -v3 -a"
 		echo "Sophos done"
 	}
@@ -1658,10 +1696,12 @@ function os_update_desinfect2017() {
 	{
 		echo "F-Secure..."
 		chroot "$chroot_dir" /bin/bash -c "/etc/init.d/fsaua start"
-		sleep 30s
+		chroot "$chroot_dir" /bin/bash -c "/etc/init.d/fsupdate stop"
-		chroot "$chroot_dir" /bin/bash -c "/opt/f-secure/fssp/bin/dbupdate_lite" && echo "Update Success"
+		( sleep 1m; chroot "$chroot_dir" /bin/bash -c "/etc/init.d/fsaua start" ) &
-		sleep 5s
+		chroot "$chroot_dir" /bin/bash --login -c "/opt/f-secure/fssp/bin/dbupdate_lite" && echo "Update Success"
+		sleep 1m
 		chroot "$chroot_dir" /bin/bash -c "/etc/init.d/fsaua stop"
+		chroot "$chroot_dir" /bin/bash -c "/etc/init.d/fsupdate stop"
 		echo "F-Secure done"
 	}
 
@@ -1679,11 +1719,8 @@ function tools_add() {
 	tools_list="$2"
 
 	chroot "$chroot_dir" /bin/bash -c "apt-get update" > /dev/null
-	[ "$?" == "0" ] && {
+	[ "$?" == "0" ] && echo "apt-get update: success"
-		echo "apt-get update: success"
 	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"
 }
 
@@ -1727,14 +1764,5 @@ function tools_add_desinfect2017() {
 if [ -z "$1" ]; then
 	main_$modus_default
 else
-	main_$1
+	main_$1 $2 $3 $4 $5 $6 $7 $8 $9
 fi
-
-
-#packet=plumadfd
-#[ "`dpkg -l $packet 2>&1`" == "dpkg-query: Kein Paket gefunden, das auf $packet passt" ] && {
-#	echo not installed $packet
-#}
-#Benötigte packete:
-# unsquashfs; mksquashfs; xorriso; wget; sed; chroot; sendemail;
-# apt install xorriso wget sed sendemail squashfs-tools