From 11609bccf21225c5949a1e2ea29da601a5f9d4d3 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Fri, 11 Nov 2011 22:01:51 +0000 Subject: [PATCH] Update README to build on OSX. Closes #383 --- README | 5 +++-- SparkleLib/SparkleConfig.cs | 3 ++- SparkleShare/Mac/SparkleShare.csproj | 1 + SparkleShare/SparkleControllerBase.cs | 7 +++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README b/README index 0c383626..8dfd1a40 100644 --- a/README +++ b/README @@ -109,9 +109,10 @@ Now that you have compiled the libraries, open 'SparkleShare/Mac/SparkleShare.sl MonoDevelop and start the build. To create the SparkleShare.app, make sure the project is focused and select Project from the menu bar -and click "Create Mac Installer..." Save the SparkleShare.app somewhere. +and click "Create Mac Installer...". Make sure to select "Don't link assemblies". -Paste the contents of the following file in SparkleShare.app/Contents/MonoBundle/config: +Save the SparkleShare.app somewhere. Paste the contents of +the following file in SparkleShare.app/Contents/MonoBundle/config: https://raw.github.com/gist/1aeffa61bac73fc08eca/0c0f09ef9e36864c35f34fd5e8bf4f99886be193/gistfile1.txt Copy /Library/Frameworks/Mono.framework/Versions/Current/lib/libintl.dylib diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 03a80846..61abd5e9 100755 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -117,7 +117,8 @@ namespace SparkleLib { "" + n + " " + n + " " + user_name + "" + n + - " Unknown" + n + " " + n + + " Unknown" + n + + " " + n + ""); SparkleHelpers.DebugInfo ("Config", "Created \"" + FullPath + "\""); diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index d9c0e8f1..d2f87467 100755 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -66,6 +66,7 @@ False ..\..\bin\SparkleLib.dll + diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index d72d236c..38be86bd 100755 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -886,15 +886,14 @@ namespace SparkleShare { // Add some restrictions to what the key can // do when uploaded to the server - string public_key = File.ReadAllText (key_file_path + ".pub"); - public_key = "no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty " + public_key; - File.WriteAllText (key_file_path + ".pub", public_key); + // string public_key = File.ReadAllText (key_file_path + ".pub"); + // public_key = "no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty " + public_key; + // File.WriteAllText (key_file_path + ".pub", public_key); // Create an easily accessible copy of the public // key in the user's SparkleShare folder File.Copy (key_file_path + ".pub", Path.Combine (SparklePath, UserName + "'s key.txt")); - } }