merge combined lists

2011-06-12 14:57:18 +12:00 · 2011-06-12 14:57:18 +12:00 · 4641a9a19e
commit 4641a9a19e
parent 9aae7d741c
13 changed files with 669 additions and 3 deletions
--- a/scripts/combine/firefox-adblock-chn.sh
+++ b/scripts/combine/firefox-adblock-chn.sh
@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Chinese) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-chn.txt > $TESTDIR/fanboy-chn-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-chn-temp2.txt > $TESTDIR/fanboy-chn-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-chn-temp.txt > $TESTDIR/fanboy-chn-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-chn-temp2.txt > $TESTDIR/fanboy-chn-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-chn-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-chn-merged.txt $MAINDIR/r/fanboy+chinese.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+chinese.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+chinese.txt.gz $MAINDIR/r/fanboy+chinese.txt > /dev/null
--- a/scripts/combine/firefox-adblock-esp.sh
+++ b/scripts/combine/firefox-adblock-esp.sh
@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Espanol) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-esp.txt > $TESTDIR/fanboy-esp-temp.txt
+
+# Seperage off Easylist filters
+#
+sed -n '/Portuguese Adblock/,/Easylist-specific/{/Easylist-specific/!p}' $TESTDIR/fanboy-esp-temp.txt > $TESTDIR/fanboy-esp-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-esp-temp2.txt > $TESTDIR/fanboy-esp-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-esp-temp.txt > $TESTDIR/fanboy-esp-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-esp-temp2.txt > $TESTDIR/fanboy-esp-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-esp-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-esp-merged.txt $MAINDIR/r/fanboy+espanol.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+espanol.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+espanol.txt.gz $MAINDIR/r/fanboy+espanol.txt > /dev/null
--- a/scripts/combine/firefox-adblock-ind.sh
+++ b/scripts/combine/firefox-adblock-ind.sh
@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Indian) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-ind.txt > $TESTDIR/fanboy-ind-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-ind-temp2.txt > $TESTDIR/fanboy-ind-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-ind-temp.txt > $TESTDIR/fanboy-ind-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-ind-temp2.txt > $TESTDIR/fanboy-ind-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-ind-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-ind-merged.txt $MAINDIR/r/fanboy+indian.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+indian.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+indian.txt.gz $MAINDIR/r/fanboy+indian.txt > /dev/null
--- a/scripts/combine/firefox-adblock-ita.sh
+++ b/scripts/combine/firefox-adblock-ita.sh
@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Italian) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-ita.txt > $TESTDIR/fanboy-ita-temp.txt
+
+# Seperage off Easylist filters
+#
+sed -n '/Italian-addon/,/Easylist-specific/{/Easylist-specific/!p}' $TESTDIR/fanboy-ita-temp.txt > $TESTDIR/fanboy-ita-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-ita-temp2.txt > $TESTDIR/fanboy-ita-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-ita-temp.txt > $TESTDIR/fanboy-ita-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-ita-temp2.txt > $TESTDIR/fanboy-ita-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-ita-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-ita-merged.txt $MAINDIR/r/fanboy+italian.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+italian.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+italian.txt.gz $MAINDIR/r/fanboy+italian.txt > /dev/null
--- a/scripts/combine/firefox-adblock-jpn.sh
+++ b/scripts/combine/firefox-adblock-jpn.sh
@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Japanese) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-jpn.txt > $TESTDIR/fanboy-jpn-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-jpn-temp2.txt > $TESTDIR/fanboy-jpn-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-jpn-temp.txt > $TESTDIR/fanboy-jpn-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-jpn-temp2.txt > $TESTDIR/fanboy-jpn-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-jpn-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-jpn-merged.txt $MAINDIR/r/fanboy+japanese.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+japanese.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+japanese.txt.gz $MAINDIR/r/fanboy+japanese.txt > /dev/null
--- a/scripts/combine/firefox-adblock-krn.sh
+++ b/scripts/combine/firefox-adblock-krn.sh
@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Korean) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-krn.txt > $TESTDIR/fanboy-krn-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-krn-temp2.txt > $TESTDIR/fanboy-krn-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-krn-temp.txt > $TESTDIR/fanboy-krn-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-krn-temp2.txt > $TESTDIR/fanboy-krn-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-krn-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-krn-merged.txt $MAINDIR/r/fanboy+korean.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+korean.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+korean.txt.gz $MAINDIR/r/fanboy+korean.txt > /dev/null
--- a/scripts/combine/firefox-adblock-pol.sh
+++ b/scripts/combine/firefox-adblock-pol.sh
@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Polish) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-pol.txt > $TESTDIR/fanboy-pol-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-pol-temp2.txt > $TESTDIR/fanboy-pol-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-pol-temp.txt > $TESTDIR/fanboy-pol-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-pol-temp2.txt > $TESTDIR/fanboy-pol-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-pol-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-pol-merged.txt $MAINDIR/r/fanboy+polish.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+polish.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+polish.txt.gz $MAINDIR/r/fanboy+polish.txt > /dev/null
--- a/scripts/combine/firefox-adblock-rus.sh
+++ b/scripts/combine/firefox-adblock-rus.sh
@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Russian) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-rus-v2.txt > $TESTDIR/fanboy-rus-temp.txt
+
+# Seperage off Easylist filters
+#
+sed -n '/Russian-V2-addon/,/Easylist-specific/{/Easylist-specific/!p}' $TESTDIR/fanboy-rus-temp.txt > $TESTDIR/fanboy-rus-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-rus-temp2.txt > $TESTDIR/fanboy-rus-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-rus-temp.txt > $TESTDIR/fanboy-rus-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-rus-temp2.txt > $TESTDIR/fanboy-rus-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-rus-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-rus-merged.txt $MAINDIR/r/fanboy+russian.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+russian.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+russian.txt.gz $MAINDIR/r/fanboy+russian.txt > /dev/null
--- a/scripts/combine/firefox-adblock-swe.sh
+++ b/scripts/combine/firefox-adblock-swe.sh
@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Swedish) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-swe.txt > $TESTDIR/fanboy-swe-temp.txt
+
+# Seperage off Easylist filters
+#
+sed -n '/Swedish-addon/,/EasyList Users/{/EasyList Users/!p}' $TESTDIR/fanboy-swe-temp.txt > $TESTDIR/fanboy-swe-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-swe-temp2.txt > $TESTDIR/fanboy-swe-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-swe-temp.txt > $TESTDIR/fanboy-swe-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-swe-temp2.txt > $TESTDIR/fanboy-swe-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-swe-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-swe-merged.txt $MAINDIR/r/fanboy+swedish.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+swedish.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+swedish.txt.gz $MAINDIR/r/fanboy+swedish.txt > /dev/null
--- a/scripts/combine/firefox-adblock-tracking.sh
+++ b/scripts/combine/firefox-adblock-tracking.sh
@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Tracking) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/fanboy-adblocklist-stats.txt > $TESTDIR/fanboy-stats-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-stats-temp2.txt > $TESTDIR/fanboy-stats-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-stats-temp.txt > $TESTDIR/fanboy-stats-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-stats-temp2.txt > $TESTDIR/fanboy-stats-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-stats-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-stats-merged.txt $MAINDIR/r/fanboy+tracking.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+tracking.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+tracking.txt.gz $MAINDIR/r/fanboy+tracking.txt > /dev/null
--- a/scripts/combine/firefox-adblock-turk.sh
+++ b/scripts/combine/firefox-adblock-turk.sh
@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Turkish) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-tky.txt > $TESTDIR/fanboy-tky-temp.txt
+
+# Seperage off Easylist filters
+#
+sed -n '/Turkish-addon/,/Easylist-specific/{/Easylist-specific/!p}' $TESTDIR/fanboy-tky-temp.txt > $TESTDIR/fanboy-tky-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-tky-temp2.txt > $TESTDIR/fanboy-tky-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-tky-temp.txt > $TESTDIR/fanboy-tky-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-tky-temp2.txt > $TESTDIR/fanboy-tky-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-tky-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-tky-merged.txt $MAINDIR/r/fanboy+turkish.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+turkish.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+turkish.txt.gz $MAINDIR/r/fanboy+turkish.txt > /dev/null
--- a/scripts/combine/firefox-adblock-vtn.sh
+++ b/scripts/combine/firefox-adblock-vtn.sh
@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Fanboy-Merge (Vietnam) Adblock list grabber script v1.0 (12/06/2011)
+# Dual License CCby3.0/GPLv2
+# http://creativecommons.org/licenses/by/3.0/
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+
+# Creating a 20Mb ramdisk Temp storage...
+#
+if [ ! -d "/tmp/ramdisk/" ]; then
+    rm -rf /tmp/ramdisk/
+    mkdir /tmp/ramdisk; chmod 777 /tmp/ramdisk
+    mount -t tmpfs -o size=20M tmpfs /tmp/ramdisk/
+    mkdir /tmp/ramdisk/opera/
+fi
+
+# Variables for directorys
+#
+MAINDIR="/var/www/adblock"
+GOOGLEDIR="/home/fanboy/google/fanboy-adblock-list"
+TESTDIR="/tmp/ramdisk"
+ZIP="/usr/local/bin/7za"
+
+
+# Trim off header file (first 2 lines)
+#
+sed '1,2d' $GOOGLEDIR/firefox-regional/fanboy-adblocklist-vtn.txt > $TESTDIR/fanboy-vtn-temp2.txt
+
+# Remove Empty Lines
+#
+sed '/^$/d' $TESTDIR/fanboy-vtn-temp2.txt > $TESTDIR/fanboy-vtn-temp.txt
+
+# Remove Bottom Line
+#
+sed '$d' < $TESTDIR/fanboy-vtn-temp.txt > $TESTDIR/fanboy-vtn-temp2.txt
+
+# Merge to the files together
+#
+cat $MAINDIR/fanboy-adblock.txt $TESTDIR/fanboy-vtn-temp2.txt > $TESTDIR/fanboy-vtn-merged.txt
+perl $MAINDIR/addChecksum.pl $TESTDIR/fanboy-vtn-merged.txt
+
+# Copy Merged file to main dir
+#
+cp $TESTDIR/fanboy-vtn-merged.txt $MAINDIR/r/fanboy+vietnam.txt
+
+# Compress file
+#
+rm -f $MAINDIR/r/fanboy+vietnam.txt.gz
+$ZIP a -mx=9 -y -tgzip $MAINDIR/r/fanboy+vietnam.txt.gz $MAINDIR/r/fanboy+vietnam.txt > /dev/null
--- a/scripts/list-grabber.sh
+++ b/scripts/list-grabber.sh
@ -77,8 +77,30 @@ then
    #
    $GOOGLEDIR/scripts/firefox/fanboy-noele.sh
    
-    # Combine (czech)
+    # Combine (Czech)
    $GOOGLEDIR/scripts/combine/firefox-adblock-czech.sh
+    # Combine (Espanol)
+		$GOOGLEDIR/scripts/combine/firefox-adblock-esp.sh
+    # Combine (Russian)
+    $GOOGLEDIR/scripts/combine/firefox-adblock-rus.sh
+    # Combine (Japanese)
+    $GOOGLEDIR/scripts/combine/firefox-adblock-jpn.sh
+    # Combine (Swedish)
+    $GOOGLEDIR/scripts/combine/firefox-adblock-swe.sh
+    # Combine (Chinese)
+    $GOOGLEDIR/scripts/combine/firefox-adblock-chn.sh
+    # Combine (Vietnam)
+    $GOOGLEDIR/scripts/combine/firefox-adblock-vtn.sh
+    # Combine (Vietnam)
+    $GOOGLEDIR/scripts/combine/firefox-adblock-krn.sh
+    # Combine (Turkish)
+    $GOOGLEDIR/scripts/combine/firefox-adblock-turk.sh
+    # Combine (Italian)
+    $GOOGLEDIR/scripts/combine/firefox-adblock-ita.sh
+    # Combine (Polish)
+    $GOOGLEDIR/scripts/combine/firefox-adblock-pol.sh    
+    # Combine
+    $GOOGLEDIR/scripts/combine/firefox-adblock-tracking.sh
    
    echo "Updated: fanboy-adblock.txt" > /dev/null
  fi
@ -103,6 +125,8 @@ then
    sh /etc/crons/hg-grab-intl.sh
    # Generate IE script
    $GOOGLEDIR/scripts/ie/tracking-ie-generator.sh
+    # Combine
+    $GOOGLEDIR/scripts/combine/firefox-adblock-tracking.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -181,6 +205,8 @@ then
   $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-russian.txt.gz $MAINDIR/fanboy-russian.txt > /dev/null
   # Generate IE script
   $GOOGLEDIR/scripts/ie/russian-ie-generator.sh
+   # Combine
+   $GOOGLEDIR/scripts/combine/firefox-adblock-rus.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -200,7 +226,9 @@ then
   rm -f $MAINDIR/fanboy-turkish.txt.gz
   $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-turkish.txt.gz $MAINDIR/fanboy-turkish.txt > /dev/null
   # Generate IE script
-   $GOOGLEDIR/scripts/ie/turkish-ie-generator.sh 
+   $GOOGLEDIR/scripts/ie/turkish-ie-generator.sh
+   # Combine
+   $GOOGLEDIR/scripts/combine/firefox-adblock-turk.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -221,6 +249,8 @@ then
   $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-japanese.txt.gz $MAINDIR/fanboy-japanese.txt > /dev/null
   # Generate IE script
   $GOOGLEDIR/scripts/ie/italian-ie-generator.sh
+   # Combine
+   $GOOGLEDIR/scripts/combine/firefox-adblock-jpn.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -239,6 +269,8 @@ then
    cp -f $GOOGLEDIR/firefox-regional/fanboy-adblocklist-krn.txt $MAINDIR/fanboy-korean.txt
    rm -f $MAINDIR/fanboy-korean.txt.gz
    $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-korean.txt.gz $MAINDIR/fanboy-korean.txt > /dev/null
+    # Combine
+    $GOOGLEDIR/scripts/combine/firefox-adblock-krn.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -259,7 +291,9 @@ then
    rm -f $MAINDIR/fanboy-italian.txt.gz
    $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-italian.txt.gz $MAINDIR/fanboy-italian.txt > /dev/null
    # Generate IE script
-     $GOOGLEDIR/scripts/ie/italian-ie-generator.sh
+    $GOOGLEDIR/scripts/ie/italian-ie-generator.sh
+    # Combine
+    $GOOGLEDIR/scripts/combine/firefox-adblock-ita.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -278,6 +312,8 @@ then
    cp -f $GOOGLEDIR/firefox-regional/fanboy-adblocklist-pol.txt $MAINDIR/fanboy-polish.txt
    rm -f $MAINDIR/fanboy-polish.txt.gz
    $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-polish.txt.gz $MAINDIR/fanboy-polish.txt /dev/null
+    # Combine
+    $GOOGLEDIR/scripts/combine/firefox-adblock-pol.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -296,6 +332,8 @@ then
    cp -f $GOOGLEDIR/firefox-regional/fanboy-adblocklist-ind.txt $MAINDIR/fanboy-indian.txt
    rm -f $MAINDIR/fanboy-indian.txt.gz
    $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-indian.txt.gz $MAINDIR/fanboy-indian.txt > /dev/null
+    # Combine
+    $GOOGLEDIR/scripts/combine/firefox-adblock-ind.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -314,6 +352,8 @@ then
    cp -f $GOOGLEDIR/firefox-regional/fanboy-adblocklist-vtn.txt $MAINDIR/fanboy-vietnam.txt
    rm -f $MAINDIR/fanboy-vietnam.txt.gz
    $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-vietnam.txt.gz $MAINDIR/fanboy-vietnam.txt > /dev/null
+    # Combine
+    $GOOGLEDIR/scripts/combine/firefox-adblock-vtn.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -332,6 +372,8 @@ then
    cp -f $GOOGLEDIR/firefox-regional/fanboy-adblocklist-chn.txt $MAINDIR/fanboy-chinese.txt
    rm -f $MAINDIR/fanboy-chinese.txt.gz
    $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-chinese.txt.gz $MAINDIR/fanboy-chinese.txt > /dev/null
+    # Combine
+    $GOOGLEDIR/scripts/combine/firefox-adblock-chn.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -352,6 +394,8 @@ then
    $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-espanol.txt.gz $MAINDIR/fanboy-espanol.txt > /dev/null
 		# Generate IE script
 		$GOOGLEDIR/scripts/ie/espanol-ie-generator.sh
+		# Combine
+		$GOOGLEDIR/scripts/combine/firefox-adblock-esp.sh
 fi
 else
  # echo "Something went bad, file size is 0"
@ -370,6 +414,8 @@ then
    cp -f $GOOGLEDIR/firefox-regional/fanboy-adblocklist-swe.txt $MAINDIR/fanboy-swedish.txt
    rm -f $MAINDIR/fanboy-swedish.txt.gz
    $ZIP a -mx=9 -y -tgzip $MAINDIR/fanboy-swedish.txt.gz $MAINDIR/fanboy-swedish.txt > /dev/null
+    # Combine
+    $GOOGLEDIR/scripts/combine/firefox-adblock-swe.sh
 fi
 else
  # echo "Something went bad, file size is 0"