From f66b6fe23aefcc86bc062959cf512a3e5a99b7f2 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Sat, 3 Mar 2012 01:41:47 +0000
Subject: [PATCH] * try to fix loadLibrary issues with mac/linux

---
 build.xml                                           |   2 +-
 installer/msi/filebot-wix.xml                       |   2 +-
 .../{lib7-Zip-JBinding.dll => 7-Zip-JBinding.dll}   | Bin
 .../{lib7-Zip-JBinding.dll => 7-Zip-JBinding.dll}   | Bin
 source/net/sourceforge/filebot/archive/Archive.java |   2 +-
 website/index.html                                  |   2 +-
 website/naming.html                                 |   2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/native/win32-x64/{lib7-Zip-JBinding.dll => 7-Zip-JBinding.dll} (100%)
 rename lib/native/win32-x86/{lib7-Zip-JBinding.dll => 7-Zip-JBinding.dll} (100%)

diff --git a/build.xml b/build.xml
index d48d3968..4e2c471c 100644
--- a/build.xml
+++ b/build.xml
@@ -213,7 +213,7 @@
 
 	<target name="msi-arch">
 		<property name="mediainfo" location="${dir.lib}/native/win32-${arch}/MediaInfo.dll" />
-		<property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/lib7-Zip-JBinding.dll" />
+		<property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/7-Zip-JBinding.dll" />
 		<property name="libgcc_path" location="${dir.lib}/native/win32-${arch}/${libgcc_name}" />
 		<property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" />
 		
diff --git a/installer/msi/filebot-wix.xml b/installer/msi/filebot-wix.xml
index 6c2057d3..31dc51f4 100644
--- a/installer/msi/filebot-wix.xml
+++ b/installer/msi/filebot-wix.xml
@@ -32,7 +32,7 @@
 					<Component Id='ApplicationBase' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E'>
 						<File Id='FileBot.jar' Name='FileBot.jar' Source='$(var.fatjar)' KeyPath='yes' />
 						<File Id='MediaInfo.dll' Name='MediaInfo.dll' Source='$(var.mediainfo)' />
-						<File Id='lib7_Zip_JBinding.dll' Name='lib7-Zip-JBinding.dll' Source='$(var.lib7z_binding)' />
+						<File Id='lib7_Zip_JBinding.dll' Name='7-Zip-JBinding.dll' Source='$(var.lib7z_binding)' />
 						<File Id='libgcc.dll' Name='$(var.libgcc_name)' Source='$(var.libgcc_path)' />
 					</Component>
 				</Directory>
diff --git a/lib/native/win32-x64/lib7-Zip-JBinding.dll b/lib/native/win32-x64/7-Zip-JBinding.dll
similarity index 100%
rename from lib/native/win32-x64/lib7-Zip-JBinding.dll
rename to lib/native/win32-x64/7-Zip-JBinding.dll
diff --git a/lib/native/win32-x86/lib7-Zip-JBinding.dll b/lib/native/win32-x86/7-Zip-JBinding.dll
similarity index 100%
rename from lib/native/win32-x86/lib7-Zip-JBinding.dll
rename to lib/native/win32-x86/7-Zip-JBinding.dll
diff --git a/source/net/sourceforge/filebot/archive/Archive.java b/source/net/sourceforge/filebot/archive/Archive.java
index aeb9acd4..ba2150c6 100644
--- a/source/net/sourceforge/filebot/archive/Archive.java
+++ b/source/net/sourceforge/filebot/archive/Archive.java
@@ -44,7 +44,7 @@ public class Archive implements Closeable {
 				System.loadLibrary(Platform.is64Bit() ? "libgcc_s_sjlj-1" : "mingwm10");
 			}
 			
-			System.loadLibrary("lib7-Zip-JBinding");
+			System.loadLibrary("7-Zip-JBinding");
 			SevenZip.initLoadedLibraries();
 			nativeLibrariesLoaded = true;
 		} catch (Throwable e) {
diff --git a/website/index.html b/website/index.html
index 8cd3f6a3..ccbc227d 100644
--- a/website/index.html
+++ b/website/index.html
@@ -200,7 +200,7 @@
 					<ul class="list">
 						<li>Executable Jar: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.jar'])" target="_blank" href="download.php?type=jar">FileBot_@{version}.jar</a> (<strong>12.5MB</strong>) <small class="comment">for Windows, Linux, Mac OS X, BSD and Solaris</small>
 							<ul>
-								<li>This package does not include the <a href="http://mediainfo.sourceforge.net/en/Download" target="_blank">MediaInfo native libraries</a>. <small class="comment">32-bit JRE requires 32-bit native libs</small></li>
+								<li>This package does not include the <a href="http://filebot.svn.sourceforge.net/viewvc/filebot/trunk/lib/native/" target="_blank">MediaInfo and 7-Zip native libraries</a>. <small class="comment">32-bit JRE requires 32-bit native libs</small></li>
 							</ul>
 						</li>
 						<li>Mac OS X app bundle: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.app'])" target="_blank" href="download.php?type=app">FileBot_@{version}.app</a> (<strong>15MB</strong>)</li>
diff --git a/website/naming.html b/website/naming.html
index b0e997fe..74251a46 100644
--- a/website/naming.html
+++ b/website/naming.html
@@ -98,7 +98,7 @@
 					<code><span class="block start">{</span><span class="variable">n</span>.<span class="method">space</span>(<span class="string">'.'</span>).<span class="method">lower</span>()<span class="block end">}</span>.<span class="block start">{</span><span class="variable">s</span><span class="block end">}</span><span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span></code>dark.angel.301
 					</p>
 					<p>
-					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> (<span class="block start">{</span><span class="variable">y</span><span class="block end">}</span>) <span class="block start">{</span><span class="string">" CD<span class="variable">$pi</span>"</span><span class="block end">}</span></code>The Man from Earth (2007) CD1
+					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> (<span class="block start">{</span><span class="variable">y</span><span class="block end">}</span>)<span class="block start">{</span><span class="string">" CD<span class="variable">$pi</span>"</span><span class="block end">}</span></code>The Man from Earth (2007) CD1
 					</p>
 					<p>
 					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> [<span class="block start">{</span><span class="variable">y</span><span class="block end">}</span>] <span class="block start">{</span><span class="variable">vf</span><span class="block end">}</span> <span class="block start">{</span><span class="variable">af</span><span class="block end">}</span></code>The Man from Earth [2007] 720p 6ch