From cf455d01d1e0d1dfd099f81292b475e0dda1d245 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Tue, 28 Sep 2010 08:24:51 +0200
Subject: [PATCH] [molecules] fix gforensic inner_chroot_script_after execution

---
 molecules/sabayon-x86-gforensic.spec          |  2 +-
 ...aster_generic_inner_chroot_script_after.sh | 15 ++++------
 ...ter_gforensic_inner_chroot_script_after.sh | 28 -------------------
 3 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100755 scripts/remaster_gforensic_inner_chroot_script_after.sh

diff --git a/molecules/sabayon-x86-gforensic.spec b/molecules/sabayon-x86-gforensic.spec
index 228a725..c06986a 100644
--- a/molecules/sabayon-x86-gforensic.spec
+++ b/molecules/sabayon-x86-gforensic.spec
@@ -40,7 +40,7 @@ inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
 
 # Inner chroot script command, to be executed inside destination chroot after
 # packages installation and removal
-inner_chroot_script_after: /sabayon/scripts/remaster_gforensic_inner_chroot_script_after.sh gnome
+inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh gnome
 
 # Outer chroot script command, to be executed outside destination chroot before
 # before entering it (and AFTER inner_chroot_script)
diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 2e262f4..f9bdbfe 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -163,16 +163,13 @@ if [ -n "${SHIP_NVIDIA_LEGACY}" ]; then
 	fi
 fi
 
-# fix clamav shit if available
-clamav_avail="$(equo match --installed app-antivirus/clamav -q)"
-if [ -n "${clamav_avail}" ]; then
-	if [ ! -d "/var/log/clamav" ]; then
-		mkdir -p /var/log/clamav
-		chown clamav:clamav /var/log/clamav
-	fi
-	touch /var/log/clamav/freshclam.log
-	chown clamav:clamav /var/log/clamav -R
+# fix clamav shit if available, mainly for Gforensic
+if [ ! -d "/var/log/clamav" ]; then
+	mkdir -p /var/log/clamav
+	chown clamav:clamav /var/log/clamav
 fi
+touch /var/log/clamav/freshclam.log
+chown clamav:clamav /var/log/clamav -R
 
 # if Sabayon GNOME, drop qt-gui bins
 gnome_panel=$(qlist -ICve gnome-base/gnome-panel)
diff --git a/scripts/remaster_gforensic_inner_chroot_script_after.sh b/scripts/remaster_gforensic_inner_chroot_script_after.sh
deleted file mode 100755
index a8af056..0000000
--- a/scripts/remaster_gforensic_inner_chroot_script_after.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# call parent script first
-/sabayon/scripts/remaster_generic_inner_chroot_script_after.sh $@
-
-touch /var/log/clamav/freshclam.log
-chown clamav:clamav /var/log/clamav -R
-
-# do custom stuff
-#remove desktop icons
-rm /etc/skel/Desktop/*
-#remove no longer needed folders/files
-rm -r /etc/skel/.fluxbox
-rm -r /etc/skel/.e
-rm -r /etc/skel/.kde4
-rm -r /etc/skel/.mozilla
-rm -r /etc/skel/.emerald
-rm -r /etc/skel/.xchat2
-rm -r /etc/skel/.config/compiz
-rm -r /etc/skel/.config/lxpanel
-rm -r /etc/skel/.config/pcmanfm
-rm -r /etc/skel/.config/Thunar
-rm -r /etc/skel/.config/xfce4
-rm -r /etc/skel/.gconf/apps/compiz
-rm -r /etc/skel/.gconf/apps/gset-compiz
-rm /etc/skel/.config/menus/applications-kmenuedit.menu
-rm /etc/skel/.kderc
-