incorrectly added wrong variable name

This commit is contained in:
fanboy 2012-08-23 19:01:41 +12:00
parent 07eecbed60
commit 8e831dbc91
4 changed files with 53 additions and 53 deletions

View File

@ -24,25 +24,25 @@ export IRONDIR="/tmp/Ramdisk/www/adblock/iron"
# Copy the Tracking addon from google dir
#
cp -f $HGSYNC/other/tracking-intl.txt $TESTDIR
cp -f $HGSERV/other/tracking-intl.txt $TESTDIR
sed '1,10d' $HGSYNC/ie/fanboy-tracking-addon.txt > $TESTDIR/fanboy-tracking-addon2.txt
sed '1,10d' $HGSERV/ie/fanboy-tracking-addon.txt > $TESTDIR/fanboy-tracking-addon2.txt
mv -f $TESTDIR/fanboy-tracking-addon2.txt $TESTDIR/fanboy-tracking-addon.txt
# Copy Filters from the subscriptions..
#
sed -n '/Czech Trackers/,/Slovak Filters/{/Slovak Filters/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-cz.txt > $TESTDIR/fanboy-cz-track.txt
sed -n '/Russian Trackers/,/Russian Whitelist/{/Russian Whitelist/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-rus-v2.txt > $TESTDIR/fanboy-rus-track.txt
sed -n '/Turkish Trackers/,/Firefox 3.x/{/Firefox 3.x/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-tky.txt > $TESTDIR/fanboy-tky-track.txt
sed -n '/Japanese Trackers/,/Japanese Whitelist/{/Japanese Whitelist/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-jpn.txt > $TESTDIR/fanboy-jpn-track.txt
sed -n '/Korean Trackers/,/Korean Specific Whitelists/{/Korean Specific Whitelists/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-krn.txt > $TESTDIR/fanboy-krn-track.txt
sed -n '/Italian Trackers/,/Whitelists/{/Whitelists/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-ita.txt> $TESTDIR/fanboy-ita-track.txt
sed -n '/Polish Trackers/,/Polish Whitelist/{/Polish Whitelist/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-pol.txt > $TESTDIR/fanboy-pol-track.txt
sed -n '/Indian Trackers/,/Indian Whitelists/{/Indian Whitelists/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-ind.txt > $TESTDIR/fanboy-ind-track.txt
sed -n '/Vietnamese Trackers/,/Whitelists/{/Whitelists/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-vtn.txt > $TESTDIR/fanboy-vtn-track.txt
sed -n '/Chinese Trackers/,/Chinese Whitelist/{/Chinese Whitelist/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-chn.txt > $TESTDIR/fanboy-chn-track.txt
sed -n '/Portuguese Trackers/,/Portuguese Generic/{/Portuguese Generic/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-esp.txt > $TESTDIR/fanboy-esp-track.txt
sed -n '/Swedish Trackers/,/Swedish Whitelist/{/Swedish Whitelist/!p}' $HGSYNC/firefox-regional/fanboy-adblocklist-swe.txt > $TESTDIR/fanboy-swe-track.txt
sed -n '/Czech Trackers/,/Slovak Filters/{/Slovak Filters/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-cz.txt > $TESTDIR/fanboy-cz-track.txt
sed -n '/Russian Trackers/,/Russian Whitelist/{/Russian Whitelist/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-rus-v2.txt > $TESTDIR/fanboy-rus-track.txt
sed -n '/Turkish Trackers/,/Firefox 3.x/{/Firefox 3.x/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-tky.txt > $TESTDIR/fanboy-tky-track.txt
sed -n '/Japanese Trackers/,/Japanese Whitelist/{/Japanese Whitelist/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-jpn.txt > $TESTDIR/fanboy-jpn-track.txt
sed -n '/Korean Trackers/,/Korean Specific Whitelists/{/Korean Specific Whitelists/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-krn.txt > $TESTDIR/fanboy-krn-track.txt
sed -n '/Italian Trackers/,/Whitelists/{/Whitelists/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-ita.txt> $TESTDIR/fanboy-ita-track.txt
sed -n '/Polish Trackers/,/Polish Whitelist/{/Polish Whitelist/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-pol.txt > $TESTDIR/fanboy-pol-track.txt
sed -n '/Indian Trackers/,/Indian Whitelists/{/Indian Whitelists/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-ind.txt > $TESTDIR/fanboy-ind-track.txt
sed -n '/Vietnamese Trackers/,/Whitelists/{/Whitelists/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-vtn.txt > $TESTDIR/fanboy-vtn-track.txt
sed -n '/Chinese Trackers/,/Chinese Whitelist/{/Chinese Whitelist/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-chn.txt > $TESTDIR/fanboy-chn-track.txt
sed -n '/Portuguese Trackers/,/Portuguese Generic/{/Portuguese Generic/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-esp.txt > $TESTDIR/fanboy-esp-track.txt
sed -n '/Swedish Trackers/,/Swedish Whitelist/{/Swedish Whitelist/!p}' $HGSERV/firefox-regional/fanboy-adblocklist-swe.txt > $TESTDIR/fanboy-swe-track.txt
# Remove Dubes and bad filters
#
@ -87,7 +87,7 @@ sed -i '/||waplog.net/d' $TESTDIR/fanboy-rus-track.txt
# Merge for IE trackers
cat $TESTDIR/fanboy-esp-track.txt $TESTDIR/fanboy-cz-track.txt $TESTDIR/fanboy-rus-track.txt $TESTDIR/fanboy-vtn-track.txt $TESTDIR/fanboy-tky-track.txt $TESTDIR/fanboy-jpn-track.txt $TESTDIR/fanboy-krn-track.txt $TESTDIR/fanboy-ita-track.txt $TESTDIR/fanboy-pol-track.txt $TESTDIR/fanboy-chn-track.txt $TESTDIR/fanboy-swe-track.txt $TESTDIR/fanboy-ind-track.txt > $TESTDIR/fanboy-track-test-ie.txt
# Merge enhanced for Firefox
cat $HGSYNC/enhancedstats-addon.txt $TESTDIR/fanboy-track-test-ie.txt > $TESTDIR/fanboy-track-test.txt
cat $HGSERV/enhancedstats-addon.txt $TESTDIR/fanboy-track-test-ie.txt > $TESTDIR/fanboy-track-test.txt
# Create a backup incase addchecksum "zeros" the file
#
cp -f $TESTDIR/fanboy-track-test.txt $TESTDIR/fanboy-track-bak.txt

View File

@ -23,7 +23,7 @@ export IRONDIR="/tmp/Ramdisk/www/adblock/iron"
# Trim off header file (first 2 lines)
#
sed '1,2d' $HGSYNC/fanboy-adblocklist-stats.txt > $TESTDIR/fanboy-stats-temp2.txt
sed '1,2d' $HGSERV/fanboy-adblocklist-stats.txt > $TESTDIR/fanboy-stats-temp2.txt
# Remove Empty Lines
#

View File

@ -27,12 +27,12 @@ export IRONDIR="/tmp/Ramdisk/www/adblock/iron"
rm -rf $TESTDIR/fanboy-addon-temp*.txt $TESTDIR/enhancedstats-addon-temp*.txt $TESTDIR/fanboy-stats-temp*.txt $TESTDIR/fanboy-complete.txt $TESTDIR/fanboy-ultimate.txt
# Tracking filter: Trim off header file, remove empty lines, and bottom line
sed '1,9d' $HGSYNC/fanboy-adblocklist-stats.txt > $TESTDIR/fanboy-stats-temp2.txt
sed '1,9d' $HGSERV/fanboy-adblocklist-stats.txt > $TESTDIR/fanboy-stats-temp2.txt
sed '/^$/d' $TESTDIR/fanboy-stats-temp2.txt > $TESTDIR/fanboy-stats-temp3.txt
sed '$d' < $TESTDIR/fanboy-stats-temp3.txt > $TESTDIR/fanboy-stats-temp.txt
# Annoyances filter: Trim off header file, remove empty lines, and bottom line
sed '1,10d' $HGSYNC/fanboy-adblocklist-addon.txt > $TESTDIR/fanboy-addon-temp2.txt
sed '1,10d' $HGSERV/fanboy-adblocklist-addon.txt > $TESTDIR/fanboy-addon-temp2.txt
sed '/^$/d' $TESTDIR/fanboy-addon-temp2.txt > $TESTDIR/fanboy-addon-temp3.txt
# Enhanced-tracking filter: Trim off header file, remove empty lines, and bottom line

View File

@ -1120,11 +1120,11 @@ then
# Combine Regional trackers
$HGSYNC/scripts/combine/firefox-adblock-intl-tracking.sh
# Generate IE script
$HGSYNC/scripts/ie/russian-ie-generator.sh
$HGSERV/scripts/ie/russian-ie-generator.sh
# Combine
$HGSYNC/scripts/combine/firefox-adblock-rus.sh
$HGSERV/scripts/combine/firefox-adblock-rus.sh
# Generate Opera RUS script also
$HGSYNC/scripts/firefox/opera-russian.sh
$HGSERV/scripts/firefox/opera-russian.sh
else
echo "Files are the same: fanboy-russian.txt" > /dev/null
fi
@ -1135,7 +1135,7 @@ SSLMAIN=$($SHA256SUM $MAINDIR/fanboy-turkish.txt | cut -d' ' -f1)
if [ "$SSLHG" != "$SSLMAIN" ]
then
cp -f $HGSYNC/firefox-regional/fanboy-adblocklist-tky.txt $TESTDIR/fanboy-turkish.txt
cp -f $HGSERV/firefox-regional/fanboy-adblocklist-tky.txt $TESTDIR/fanboy-turkish.txt
# Re-generate checksum
$ADDCHECKSUM $TESTDIR/fanboy-turkish.txt
cp -f $TESTDIR/fanboy-turkish.txt $MAINDIR/fanboy-turkish.txt
@ -1143,11 +1143,11 @@ then
rm -rf $MAINDIR/fanboy-turkish.txt.gz
$ZIP $MAINDIR/fanboy-turkish.txt.gz $TESTDIR/fanboy-turkish.txt > /dev/null
# Combine Regional trackers
$HGSYNC/scripts/combine/firefox-adblock-intl-tracking.sh
$HGSERV/scripts/combine/firefox-adblock-intl-tracking.sh
# Generate IE script
$HGSYNC/scripts/ie/turkish-ie-generator.sh
$HGSERV/scripts/ie/turkish-ie-generator.sh
# Combine
$HGSYNC/scripts/combine/firefox-adblock-turk.sh
$HGSERV/scripts/combine/firefox-adblock-turk.sh
else
echo "Files are the same: fanboy-turkish.txt" > /dev/null
fi
@ -1165,11 +1165,11 @@ then
rm -rf $MAINDIR/fanboy-japanese.txt.gz
$ZIP $MAINDIR/fanboy-japanese.txt.gz $TESTDIR/fanboy-japanese.txt > /dev/null
# Combine Regional trackers
$HGSYNC/scripts/combine/firefox-adblock-intl-tracking.sh
$HGSERV/scripts/combine/firefox-adblock-intl-tracking.sh
# Generate IE script
$HGSYNC/scripts/ie/japanese-ie-generator.sh
$HGSERV/scripts/ie/japanese-ie-generator.sh
# Combine
$HGSYNC/scripts/combine/firefox-adblock-jpn.sh
$HGSERV/scripts/combine/firefox-adblock-jpn.sh
else
echo "Files are the same: fanboy-japanese.txt" > /dev/null
fi
@ -1188,15 +1188,15 @@ then
rm -rf $MAINDIR/fanboy-korean.txt.gz
$ZIP $MAINDIR/fanboy-korean.txt.gz $TESTDIR/fanboy-korean.txt > /dev/null
# Combine Regional trackers
$HGSYNC/scripts/combine/firefox-adblock-intl-tracking.sh
$HGSERV/scripts/combine/firefox-adblock-intl-tracking.sh
# Combine
$HGSYNC/scripts/combine/firefox-adblock-krn.sh
$HGSERV/scripts/combine/firefox-adblock-krn.sh
else
echo "Files are the same: fanboy-korean.txt" > /dev/null
fi
############### Fanboy ITALIAN #################
SSLHG=$($SHA256SUM $HGSYNC/firefox-regional/fanboy-adblocklist-ita.txt | cut -d' ' -f1)
SSLHG=$($SHA256SUM $HGSERV/firefox-regional/fanboy-adblocklist-ita.txt | cut -d' ' -f1)
SSLMAIN=$($SHA256SUM $MAINDIR/fanboy-italian.txt | cut -d' ' -f1)
if [ "$SSLHG" != "$SSLMAIN" ]
@ -1207,11 +1207,11 @@ then
cp -f $TESTDIR/fanboy-italian.txt $MAINDIR/fanboy-italian.txt
$ZIP $MAINDIR/fanboy-italian.txt.gz $TESTDIR/fanboy-italian.txt > /dev/null
# Combine Regional trackers
$HGSYNC/scripts/combine/firefox-adblock-intl-tracking.sh
$HGSERV/scripts/combine/firefox-adblock-intl-tracking.sh
# Generate IE script
$HGSYNC/scripts/ie/italian-ie-generator.sh
$HGSERV/scripts/ie/italian-ie-generator.sh
# Combine
$HGSYNC/scripts/combine/firefox-adblock-ita.sh
$HGSERV/scripts/combine/firefox-adblock-ita.sh
else
echo "Files are the same: fanboy-italian.txt" > /dev/null
fi
@ -1230,20 +1230,20 @@ then
rm -rf $MAINDIR/fanboy-polish.txt.gz
$ZIP $MAINDIR/fanboy-polish.txt.gz $TESTDIR/fanboy-polish.txt > /dev/null
# Combine Regional trackers
$HGSYNC/scripts/combine/firefox-adblock-intl-tracking.sh
$HGSERV/scripts/combine/firefox-adblock-intl-tracking.sh
# Combine
$HGSYNC/scripts/combine/firefox-adblock-pol.sh
$HGSERV/scripts/combine/firefox-adblock-pol.sh
else
echo "Files are the same: fanboy-polish.txt" > /dev/null
fi
############### Fanboy INDIAN #################
SSLHG=$($SHA256SUM $HGSYNC/firefox-regional/fanboy-adblocklist-ind.txt | cut -d' ' -f1)
SSLHG=$($SHA256SUM $HGSERV/firefox-regional/fanboy-adblocklist-ind.txt | cut -d' ' -f1)
SSLMAIN=$($SHA256SUM $MAINDIR/fanboy-indian.txt | cut -d' ' -f1)
if [ "$SSLHG" != "$SSLMAIN" ]
then
cp -f $HGSYNC/firefox-regional/fanboy-adblocklist-ind.txt $TESTDIR/fanboy-indian.txt
cp -f $HGSERV/firefox-regional/fanboy-adblocklist-ind.txt $TESTDIR/fanboy-indian.txt
# Re-generate checksum
$ADDCHECKSUM $TESTDIR/fanboy-indian.txt
cp -f $TESTDIR/fanboy-indian.txt $MAINDIR/fanboy-indian.txt
@ -1251,20 +1251,20 @@ then
rm -rf $MAINDIR/fanboy-indian.txt.gz
$ZIP $MAINDIR/fanboy-indian.txt.gz $MAINDIR/fanboy-indian.txt > /dev/null
# Combine Regional trackers
$HGSYNC/scripts/combine/firefox-adblock-intl-tracking.sh
$HGSERV/scripts/combine/firefox-adblock-intl-tracking.sh
# Combine
$HGSYNC/scripts/combine/firefox-adblock-ind.sh
$HGSERV/scripts/combine/firefox-adblock-ind.sh
else
echo "Files are the same: fanboy-indian.txt" > /dev/null
fi
############### Fanboy VIETNAM #################
SSLHG=$($SHA256SUM $HGSYNC/firefox-regional/fanboy-adblocklist-vtn.txt | cut -d' ' -f1)
SSLHG=$($SHA256SUM $HGSERV/firefox-regional/fanboy-adblocklist-vtn.txt | cut -d' ' -f1)
SSLMAIN=$($SHA256SUM $MAINDIR/fanboy-vietnam.txt | cut -d' ' -f1)
if [ "$SSLHG" != "$SSLMAIN" ]
then
cp -f $HGSYNC/firefox-regional/fanboy-adblocklist-vtn.txt $TESTDIR/fanboy-vietnam.txt
cp -f $HGSERV/firefox-regional/fanboy-adblocklist-vtn.txt $TESTDIR/fanboy-vietnam.txt
# Re-generate checksum
$ADDCHECKSUM $TESTDIR/fanboy-vietnam.txt
cp -f $TESTDIR/fanboy-vietnam.txt $MAINDIR/fanboy-vietnam.txt
@ -1272,20 +1272,20 @@ then
rm -rf $MAINDIR/fanboy-vietnam.txt.gz
$ZIP $MAINDIR/fanboy-vietnam.txt.gz $MAINDIR/fanboy-vietnam.txt > /dev/null
# Combine Regional trackers
$HGSYNC/scripts/combine/firefox-adblock-intl-tracking.sh
$HGSERV/scripts/combine/firefox-adblock-intl-tracking.sh
# Combine
$HGSYNC/scripts/combine/firefox-adblock-vtn.sh
$HGSERV/scripts/combine/firefox-adblock-vtn.sh
else
echo "Files are the same: fanboy-vietnam.txt" > /dev/null
fi
############### Fanboy ESPANOL #################
SSLHG=$($SHA256SUM $HGSYNC/firefox-regional/fanboy-adblocklist-esp.txt | cut -d' ' -f1)
SSLHG=$($SHA256SUM $HGSERV/firefox-regional/fanboy-adblocklist-esp.txt | cut -d' ' -f1)
SSLMAIN=$($SHA256SUM $MAINDIR/fanboy-espanol.txt | cut -d' ' -f1)
if [ "$SSLHG" != "$SSLMAIN" ]
then
cp -f $HGSYNC/firefox-regional/fanboy-adblocklist-esp.txt $TESTDIR/fanboy-espanol.txt
cp -f $HGSERV/firefox-regional/fanboy-adblocklist-esp.txt $TESTDIR/fanboy-espanol.txt
# Re-generate checksum
$ADDCHECKSUM $TESTDIR/fanboy-espanol.txt
cp -f $TESTDIR/fanboy-espanol.txt $MAINDIR/fanboy-espanol.txt
@ -1293,22 +1293,22 @@ then
rm -rf $MAINDIR/fanboy-espanol.txt.gz
$ZIP $MAINDIR/fanboy-espanol.txt.gz $MAINDIR/fanboy-espanol.txt > /dev/null
# Combine Regional trackers
$HGSYNC/scripts/combine/firefox-adblock-intl-tracking.sh
$HGSERV/scripts/combine/firefox-adblock-intl-tracking.sh
# Generate IE script
$HGSYNC/scripts/ie/espanol-ie-generator.sh
$HGSERV/scripts/ie/espanol-ie-generator.sh
# Combine
$HGSYNC/scripts/combine/firefox-adblock-esp.sh
$HGSERV/scripts/combine/firefox-adblock-esp.sh
else
echo "Files are the same: fanboy-espanol.txt" > /dev/null
fi
############### Fanboy SWEDISH #################
SSLHG=$($SHA256SUM $HGSYNC/firefox-regional/fanboy-adblocklist-swe.txt | cut -d' ' -f1)
SSLHG=$($SHA256SUM $HGSERV/firefox-regional/fanboy-adblocklist-swe.txt | cut -d' ' -f1)
SSLMAIN=$($SHA256SUM $MAINDIR/fanboy-swedish.txt | cut -d' ' -f1)
if [ "$SSLHG" != "$SSLMAIN" ]
then
cp -f $HGSYNC/firefox-regional/fanboy-adblocklist-swe.txt $TESTDIR/fanboy-swedish.txt
cp -f $HGSERV/firefox-regional/fanboy-adblocklist-swe.txt $TESTDIR/fanboy-swedish.txt
# Re-generate checksum
$ADDCHECKSUM $TESTDIR/fanboy-swedish.txt
cp -f $TESTDIR/fanboy-swedish.txt $MAINDIR/fanboy-swedish.txt
@ -1319,9 +1319,9 @@ then
FILE="$MAINDIR/fanboy-swedish.txt"
echo $ECHORESPONSE >> $LOGFILE
# Combine Regional trackers
$HGSYNC/scripts/combine/firefox-adblock-intl-tracking.sh
$HGSERV/scripts/combine/firefox-adblock-intl-tracking.sh
# Combine
$HGSYNC/scripts/combine/firefox-adblock-swe.sh
$HGSERV/scripts/combine/firefox-adblock-swe.sh
else
echo "Files are the same: fanboy-swedish.txt" > /dev/null
fi