From d9e52e6b42b78c36ac4a8a9ae93400c6ea26d021 Mon Sep 17 00:00:00 2001
From: Saivann <saivann@gmail.com>
Date: Wed, 5 Feb 2014 14:19:46 -0500
Subject: [PATCH] Serve binaries directly from the server

---
 _contrib/build_website.sh |  2 +-
 _templates/download.html  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/_contrib/build_website.sh b/_contrib/build_website.sh
index 71e1b425..6748e50b 100755
--- a/_contrib/build_website.sh
+++ b/_contrib/build_website.sh
@@ -32,4 +32,4 @@ git clean -x -f -d
 
 # Build website
 jekyll
-rsync --delete -a $WORKDIR/_site/ $DESTDIR/
+rsync --exclude /bin/ --delete -a $WORKDIR/_site/ $DESTDIR/
diff --git a/_templates/download.html b/_templates/download.html
index 28fc2cb3..21fa38e3 100755
--- a/_templates/download.html
+++ b/_templates/download.html
@@ -6,21 +6,21 @@ id: download
 <div class="download">
   <h1>{% translate pagetitle %}</h1>
   <h2>{% translate latestversion %}{{site.DOWNLOAD_VERSION}}<a type="application/rss+xml" href="/en/rss/releases.rss"><img src="/img/icon_rss.svg" alt="rss" class="rssicon"></a></h2>
-  <div class="mainbutton"><a id="downloadbutton" href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe/download"><img src="/img/but_windows.svg" alt="icon">{% translate download %}</a></div>
+  <div class="mainbutton"><a id="downloadbutton" href="/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe"><img src="/img/but_windows.svg" alt="icon">{% translate download %}</a></div>
   <div class="downloadbox">
     <p>{% translate downloados %}</p>
     <div>
-      <div id="download_windows"><img src="/img/os/med_win.png" alt="windows"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe/download">Windows (exe)</a> <small>~12MB</small></div>
-      <div><img src="/img/os/med_win.png" alt="windows"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32.zip/download">Windows (zip)</a> <small>~16MB</small></div>
+      <div id="download_windows"><img src="/img/os/med_win.png" alt="windows"> <a href="/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe">Windows (exe)</a> <small>~12MB</small></div>
+      <div><img src="/img/os/med_win.png" alt="windows"> <a href="/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32.zip">Windows (zip)</a> <small>~16MB</small></div>
       <div><img src="/img/os/med_ubuntu.svg" alt="ubuntu"> <a href="https://launchpad.net/~bitcoin/+archive/bitcoin">Ubuntu (PPA)</a> <small>~4MB</small></div>
     </div>
     <div>
-      <div><img src="/img/os/med_osx.png" alt="osx"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-macosx.dmg/download">Mac OS X</a> <small>~14MB</small></div>
-      <div><img src="/img/os/med_linux.png" alt="linux"> <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-linux.tar.gz/download">Linux (tgz)</a> <small>~16MB</small></div>
+      <div><img src="/img/os/med_osx.png" alt="osx"> <a href="/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-macosx.dmg">Mac OS X</a> <small>~14MB</small></div>
+      <div><img src="/img/os/med_linux.png" alt="linux"> <a href="/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-linux.tar.gz">Linux (tgz)</a> <small>~16MB</small></div>
       <div><img src="/img/os/med_opensource.svg" alt="opensource"> <a href="https://github.com/bitcoin/bitcoin">Source code</a> <small>(GitHub)</small></div>
     </div>
     <p>
-      <a href="http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/SHA256SUMS.asc/view">{% case page.lang %}{% when 'ar' or 'es' or 'fa' or 'id' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}{% translate downloadsig download en %}{% else %}{% translate downloadsig %}{% endcase %}</a><br>
+      <a href="/bin/{{site.DOWNLOAD_VERSION}}/SHA256SUMS.asc">{% case page.lang %}{% when 'ar' or 'es' or 'fa' or 'id' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}{% translate downloadsig download en %}{% else %}{% translate downloadsig %}{% endcase %}</a><br>
       <a href="/en/version-history">{% translate versionhistory %}</a>
     </p>
   </div>
@@ -39,8 +39,8 @@ if(navigator.userAgent.indexOf('Linux')!=-1)var os='ubuntu';
 var but=document.getElementById('downloadbutton');
 but.getElementsByTagName('IMG')[0].src='/img/but_'+os+'.svg';
 switch(os){
-case 'windows':but.href='http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe/download';break;
+case 'windows':but.href='/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-win32-setup.exe';break;
 case 'ubuntu':but.href='https://launchpad.net/~bitcoin/+archive/bitcoin';break;
-case 'mac':but.href='http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-macosx.dmg/download';break;
+case 'mac':but.href='/bin/{{site.DOWNLOAD_VERSION}}/bitcoin-{{site.DOWNLOAD_VERSION}}-macosx.dmg';break;
 }
 </script>