Fix broken FileZilla package: change URL

Starting from v3.9.0 FileZilla is only available to download through SourceForge.
ferventcoder · Jul 25, 2014 · 4dbc709 · 4dbc709
1 parent 90276f9
commit 4dbc709
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 6 deletions.
diff --git a/filezilla/filezilla.ketarin.xml b/filezilla/filezilla.ketarin.xml
@@ -4,8 +4,8 @@
     <WebsiteUrl />
     <UserAgent />
     <UserNotes />
-    <LastFileSize>4822473</LastFileSize>
-    <LastFileDate>2014-02-11T13:49:15-06:00</LastFileDate>
+    <LastFileSize>5981830</LastFileSize>
+    <LastFileDate>2014-07-22T11:59:22+02:00</LastFileDate>
     <IgnoreFileInformation>false</IgnoreFileInformation>
     <DownloadBeta>Default</DownloadBeta>
     <DownloadDate xsi:nil="true" />
@@ -33,20 +33,62 @@
           </UrlVariable>
         </value>
       </item>
+      <item>
+        <key>
+          <string>urlUsingMirror</string>
+        </key>
+        <value>
+          <UrlVariable>
+            <RegexRightToLeft>false</RegexRightToLeft>
+            <VariableType>RegularExpression</VariableType>
+            <Regex>(?&lt;=ResponseUri: )[^\r\n]+</Regex>
+            <Url>{properUrl}</Url>
+            <Name>urlUsingMirror</Name>
+          </UrlVariable>
+        </value>
+      </item>
+      <item>
+        <key>
+          <string>properUrl</string>
+        </key>
+        <value>
+          <UrlVariable>
+            <RegexRightToLeft>false</RegexRightToLeft>
+            <VariableType>Textual</VariableType>
+            <Regex />
+            <TextualContent>http://sourceforge.net/projects/filezilla/files/FileZilla_Client/{version}/FileZilla_{version}_win32-setup.exe/download</TextualContent>
+            <Name>properUrl</Name>
+          </UrlVariable>
+        </value>
+      </item>
+      <item>
+        <key>
+          <string>url64</string>
+        </key>
+        <value>
+          <UrlVariable>
+            <RegexRightToLeft>false</RegexRightToLeft>
+            <VariableType>Textual</VariableType>
+            <Regex />
+            <TextualContent>{properUrl}</TextualContent>
+            <Name>url64</Name>
+          </UrlVariable>
+        </value>
+      </item>
     </Variables>
     <ExecuteCommand />
     <ExecutePreCommand />
     <ExecuteCommandType>Batch</ExecuteCommandType>
     <ExecutePreCommandType>Batch</ExecutePreCommandType>
     <Category />
     <SourceType>FixedUrl</SourceType>
-    <PreviousLocation>C:\Chocolatey\_work\FileZilla_3.7.4.1_win32-setup.exe</PreviousLocation>
+    <PreviousLocation>C:\Chocolatey\_work\FileZilla_3.9.0.1_win32-setup.exe</PreviousLocation>
     <DeletePreviousFile>true</DeletePreviousFile>
     <Enabled>true</Enabled>
     <FileHippoId />
-    <LastUpdated>2014-02-19T06:22:59.3699738-06:00</LastUpdated>
+    <LastUpdated>2014-07-25T20:00:28.2775441+02:00</LastUpdated>
     <TargetPath>C:\Chocolatey\_work\</TargetPath>
-    <FixedDownloadUrl>http://download.filezilla-project.org/FileZilla_{version}_win32-setup.exe</FixedDownloadUrl>
+    <FixedDownloadUrl>{urlUsingMirror}</FixedDownloadUrl>
     <Name>filezilla</Name>
   </ApplicationJob>
 </Jobs>
diff --git a/filezilla/tools/chocolateyInstall.ps1 b/filezilla/tools/chocolateyInstall.ps1
@@ -1 +1,3 @@
-Install-ChocolateyPackage 'filezilla' 'exe' '/S' '{{DownloadUrl}}'
+# {\{DownloadUrlx64}\} actually contains the URL to FileZilla 32-bit.
+
+Install-ChocolateyPackage 'filezilla' 'exe' '/S' '{{DownloadUrlx64}}'