[or-cvs] r21041: {projects} -Plus addresses ready -Not syncing against current/ anymore (projects/gettor/lib/gettor)
kaner at seul.org
kaner at seul.org
Sat Nov 28 13:04:12 UTC 2009
Author: kaner
Date: 2009-11-28 08:04:12 -0500 (Sat, 28 Nov 2009)
New Revision: 21041
Modified:
projects/gettor/lib/gettor/constants.py
projects/gettor/lib/gettor/packages.py
Log:
-Plus addresses ready
-Not syncing against current/ anymore
-Switched universal-bundle to i386-bundle for osx
Modified: projects/gettor/lib/gettor/constants.py
===================================================================
--- projects/gettor/lib/gettor/constants.py 2009-11-28 11:50:52 UTC (rev 21040)
+++ projects/gettor/lib/gettor/constants.py 2009-11-28 13:04:12 UTC (rev 21041)
@@ -43,7 +43,7 @@
Please select one of the following package names:
tor-browser-bundle
- macosx-universal-bundle
+ macosx-i386-bundle
panther-bundle
tor-im-browser-bundle
source-bundle
@@ -51,35 +51,55 @@
Please reply to this mail (to gettor at torproject.org), and tell me
a single package name anywhere in the body of your email.
+ OBTAINING LOCALIZED VERSIONS OF TOR
+ ===================================
+
Please note that GetTor can send out localized versions of Tor.
+
+ Obtaining localized Tor via 'plus' addresses:
+ --------------------------------------------
+
+ There are two ways how to receive localized versions of Tor. The
+ first and easiest is to send us email to a 'plus' address like so:
+
+ gettor+zh_CN at torproject.org
+
+ This will for exmaple give you the requested package in a localized
+ version for chinese. Check below for a list of supported language
+ codes.
+
+ Obtaining localized Tor via 'Lang' code:
+ ---------------------------------------
+
+ The other way to receive a localized Tor package is the following:
+
In your mail to us, please add a line containing "Lang:" followed by
the language abbreviation like so:
- Lang: language
+ Lang: language
For example if you want the tor-browser-bundle for in chinese, write
us an email with the following text:
- ---
- tor-browser-bundle
- Lang: zh-CN
- ---
+ tor-browser-bundle
+ Lang: zh-CN
Or, if you want the tor-browser-bundle in farsi, write us an email
with the following text:
- ---
- tor-browser-bundle
- Lang: fa-IR
- ---
+ tor-browser-bundle
+ Lang: fa
+ List of supported locales:
+ -------------------------
+
Here is a list of all available languages:
ar: Arabic
de: German
- en-US: English
- es-ES: Spanish
- fa-IR: Farsi (Iran)
+ en: English
+ es: Spanish
+ fa: Farsi (Iran)
fr: French
it: Italian
nl: Dutch
@@ -89,6 +109,9 @@
If you select no language, you will receive the english version.
+ SUPPORT
+ =======
+
If you have any questions or it doesn't work, you can contact a
human at this support email address: tor-assistants at torproject.org
Modified: projects/gettor/lib/gettor/packages.py
===================================================================
--- projects/gettor/lib/gettor/packages.py 2009-11-28 11:50:52 UTC (rev 21040)
+++ projects/gettor/lib/gettor/packages.py 2009-11-28 13:04:12 UTC (rev 21041)
@@ -50,9 +50,9 @@
"tor-browser-bundle_zh-CN": ("tor-browser-.*_zh-CN.exe$", "tor-browser-.*_zh-CN_split"),
"tor-im-browser-bundle_zh-CN": ("tor-im-browser-.*_zh-CN.exe$", "tor-im-browser-.*_zh-CN_split"),
"source-bundle": ("tor-.*.tar.gz$", "Now to something completely different"),
- #"windows-bundle": ("vidalia-bundle-.*.exe$", "vidalia-bundle-.*_split"),
- #"panther-bundle": ("vidalia-bundle-.*-ppc.dmg$", "vidalia-bundle-.*-ppc_split"),
- #"macosx-universal-bundle": ("vidalia-bundle-.*-universal.dmg$", "vidalia-bundle-.*-universal_split"),
+ "windows-bundle": ("vidalia-bundle-.*.exe$", "vidalia-bundle-.*_split"),
+ "panther-bundle": ("vidalia-bundle-.*-ppc.dmg$", "vidalia-bundle-.*-ppc_split"),
+ "macosx-i386-bundle": ("vidalia-bundle-.*-i386.dmg$", "vidalia-bundle-.*-universal_split"),
# Mike won't sign Torbutton; He doesn't get gettor support
#"torbutton": "torbutton-current.xpi$",
}
@@ -152,9 +152,11 @@
rsync.append("--exclude=*rpm*")
rsync.append("--exclude=*privoxy*")
rsync.append("--exclude=*alpha*")
+ rsync.append("--exclude=*vidalia-bundles*")
if not silent:
rsync.append("--progress")
rsync.append("rsync://%s/tor/dist/" % mirror)
+ # XXX HACK :) will be fixed soon
rsync2 = ["rsync"]
rsync2.append("-a")
# Exclude stuff we don't need
@@ -163,15 +165,25 @@
rsync2.append("--exclude=*rpm*")
rsync2.append("--exclude=*privoxy*")
rsync2.append("--exclude=*alpha*")
+ rsync2.append("--exclude=*vidalia-bundles*")
if not silent:
rsync2.append("--progress")
rsync2.append("rsync://%s/tor/torbrowser/dist/" % mirror)
rsync2.append(self.distDir)
+ rsync3 = ["rsync"]
+ rsync3.append("-a")
+ rsync3.append("--exclude=*alpha*")
+ if not silent:
+ rsync3.append("--progress")
+ rsync3.append("rsync://%s/tor/dist/vidalia-bundles/" % mirror)
+ rsync3.append(self.distDir)
rsync.append(self.distDir)
process = subprocess.Popen(rsync)
process.wait()
process = subprocess.Popen(rsync2)
process.wait()
+ process = subprocess.Popen(rsync3)
+ process.wait()
return process.returncode
def getCommandToStr(self, mirror, silent):
@@ -184,6 +196,7 @@
rsync.append("--exclude=*rpm*")
rsync.append("--exclude=*privoxy*")
rsync.append("--exclude=*alpha*")
+ rsync.append("--exclude=*vidalia-bundles*")
if not silent:
rsync.append("--progress")
rsync.append("rsync://%s/tor/dist/current/" % mirror)
More information about the tor-commits
mailing list