added some optional proprietary packages/ repositories and hooks

9 files changed, 61 insertions, 6 deletions

diff --git a/config/chroot_local-hooks/00-sources.list b/config/chroot_local-hooks/00-sources.list
index 8f8f2b8..49eaf04 100755
--- a/config/chroot_local-hooks/00-sources.list
+++ b/config/chroot_local-hooks/00-sources.list
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ -f /root/build.conf ] && . /root/build.conf
+for file in /root/config/*; do [ -r $file ] && . $file; done
 
 sed -i -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" /etc/apt/sources.list
 
diff --git a/config/chroot_local-hooks/05-ndis b/config/chroot_local-hooks/05-ndis
index 7b89a97..94b5534 100755
--- a/config/chroot_local-hooks/05-ndis
+++ b/config/chroot_local-hooks/05-ndis
@@ -1,6 +1,6 @@
 #!/bin/sh
 [ -x /usr/sbin/ndiswrapper ] || exit 0
-[ -f /root/build.conf ] && . /root/build.conf
+for file in /root/config/*; do [ -r $file ] && . $file; done
 if [ "$LB_ARCHITECTURE" = "amd64" ]; then
 wget -qO- http://kanotix.com/files/fix/ndiswrapper/ndiswrapper64-fwlan64.tar.gz|tar zxC /etc
 else
diff --git a/config/chroot_local-hooks/XX_debpool b/config/chroot_local-hooks/XX_debpool
index cecdb95..f231f54 100755
--- a/config/chroot_local-hooks/XX_debpool
+++ b/config/chroot_local-hooks/XX_debpool
@@ -1,7 +1,7 @@
 #!/bin/bash
 [ ! -e /live/packages ] && exit 0
 
-[ -f /root/build.conf ] && . /root/build.conf
+for file in /root/config/*; do [ -r $file ] && . $file; done
 [ -z "$LB_ARCHITECTURE" ] && LB_ARCHITECTURE=amd64
 [ -z "$LB_DISTRIBUTION" ] && LB_DISTRIBUTION=wheezy
 
diff --git a/config/chroot_local-hooks/ZZ_cleanup_build.conf b/config/chroot_local-hooks/ZZ_cleanup_build.conf
deleted file mode 100755
index 80e90ab..0000000
--- a/config/chroot_local-hooks/ZZ_cleanup_build.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rm -f /root/build.conf
-
diff --git a/config/chroot_local-hooks/acrobat b/config/chroot_local-hooks/acrobat
new file mode 100755
index 0000000..7415a5e
--- /dev/null
+++ b/config/chroot_local-hooks/acrobat
@@ -0,0 +1,9 @@
+#!/bin/bash
+for file in /root/config/*; do [ -r $file ] && . $file; done
+echo "$LB_PACKAGE_LISTS" | grep -qw acrobat || exit 0
+TMP=$(mktemp -d /tmp/acrobat.XXXXXX)
+wget -P $TMP http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/deu/AdbeRdr9.4.2-1_i386linux_deu.deb
+#wget -P $TMP http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i386linux_enu.deb
+http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i386linux_enu.deb
+dpkg --force-architecture -i $TMP/*.deb
+rm -rf $TMP
diff --git a/config/chroot_local-hooks/chrome b/config/chroot_local-hooks/chrome
new file mode 100755
index 0000000..dc44494
--- /dev/null
+++ b/config/chroot_local-hooks/chrome
@@ -0,0 +1,10 @@
+#!/bin/bash
+[ -x /usr/bin/google-chrome ] || exit 0
+mkdir -p /etc/skel/.config/google-chrome/Default
+cat <<"EOF" >/etc/skel/.config/google-chrome/Default/Preferences
+{
+   "browser": {
+      "custom_chrome_frame": true
+   }
+}
+EOF
diff --git a/config/chroot_local-hooks/spotify b/config/chroot_local-hooks/spotify
new file mode 100755
index 0000000..ad4de6e
--- /dev/null
+++ b/config/chroot_local-hooks/spotify
@@ -0,0 +1,11 @@
+#!/bin/bash
+for file in /root/config/*; do [ -r $file ] && . $file; done
+echo "$LB_PACKAGE_LISTS" | grep -qw spotify || exit 0
+TMP=$(mktemp -d /tmp/spotify.XXXXXX)
+# install libssl0.9.8 from squeeze
+wget -qkO $TMP/index http://snapshot.debian.org/package/openssl098/0.9.8o-7/
+grep -oe 'http[^"]*libssl0.9.8_[^"]*_'"$LB_ARCHITECTURE.deb" $TMP/index | head -n1 | wget -i- -P $TMP
+dpkg -i $TMP/*.deb
+apt-get update
+DEBIAN_FRONTEND=noninteractive apt-get -f -y install spotify-client
+rm -rf $TMP
diff --git a/config/chroot_local-hooks/teamviewer b/config/chroot_local-hooks/teamviewer
new file mode 100755
index 0000000..c6ce343
--- /dev/null
+++ b/config/chroot_local-hooks/teamviewer
@@ -0,0 +1,24 @@
+#!/bin/bash
+for file in /root/config/*; do [ -r $file ] && . $file; done
+echo "$LB_PACKAGE_LISTS" | grep -qw teamviewer || exit 0
+TMP=$(mktemp -d /tmp/teamviewer.XXXXXX)
+if [ "$LB_ARCHITECTURE" = "amd64" ]; then
+wget -NP $TMP "http://www.teamviewer.com/download/teamviewer_linux_x64.deb"
+else
+wget -NP $TMP "http://www.teamviewer.com/download/teamviewer_linux.deb"
+fi
+dpkg -i $TMP/*.deb
+apt-get update
+DEBIAN_FRONTEND=noninteractive apt-get -f -y install
+rm -rf $TMP
+/etc/init.d/teamviewerd stop || :
+killall teamviewerd || :
+while sleep 1; do pidof teamviewerd >/dev/null || break; done
+cat <<"EOF" >/opt/teamviewer8/config/global.conf
+TeamViewer Global Settings
+# It is not recommended to edit this file manually
+
+
+[int32] EulaAccepted = 1
+[int32] EulaAcceptedRevision = 5
+EOF
diff --git a/config/chroot_local-hooks/virtualbox b/config/chroot_local-hooks/virtualbox
new file mode 100755
index 0000000..d468526
--- /dev/null
+++ b/config/chroot_local-hooks/virtualbox
@@ -0,0 +1,4 @@
+#!/bin/bash
+[ -x /etc/init.d/vboxdrv ] || exit 0
+export KERN_DIR="$(ls -d /usr/src/linux-headers-* | head -n1)"
+/etc/init.d/vboxdrv setup