beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "Update from using AbsolutePath to LocalPath for all uris, fix some uri path combining."

Browse source 
This reverts commit b2b49012c1.

Conflicts:

	SparkleShare/SparkleControllerBase.cs
This commit is contained in:
Hylke Bons 2013-01-06 19:33:55 +01:00
parent b2400bb5bc
commit 8fd5974cad
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SparkleLib/Defines.cs
View file

@ -19,13 +19,13 @@ using System;
using System.Reflection;
[assembly:AssemblyTitle ("SparkleLib")]
[assembly:AssemblyVersion ("1.0.0")]
[assembly:AssemblyVersion ("1.1.0")]
[assembly:AssemblyCopyright ("Copyright (c) 2010 Hylke Bons and others")]
[assembly:AssemblyTrademark ("SparkleShare is a trademark of SparkleShare Ltd.")]
namespace SparkleLib {
public class Defines {
public const string INSTALL_DIR = "/usr/share/sparkleshare";
public const string INSTALL_DIR = "/usr/local/share/sparkleshare";
}
}

14
SparkleLib/Git/SparkleFetcherGit.cs
View file

@ -78,17 +78,17 @@ namespace SparkleLib.Git {
}
if (uri.Host.Equals ("gitorious.org") && !uri.Scheme.StartsWith ("http")) {
if (!uri.LocalPath.Equals ("/") &&
!uri.LocalPath.EndsWith (".git")) {
if (!uri.AbsolutePath.Equals ("/") &&
!uri.AbsolutePath.EndsWith (".git")) {
uri = new Uri (Path.Combine( "ssh://git@gitorious.org", uri.LocalPath, ".git"));
uri = new Uri ("ssh://git@gitorious.org" + uri.AbsolutePath + ".git");
} else {
uri = new Uri (Path.Combine ("ssh://git@gitorious.org", uri.LocalPath));
uri = new Uri ("ssh://git@gitorious.org" + uri.AbsolutePath);
}
} else if (uri.Host.Equals ("github.com") && !uri.Scheme.StartsWith ("http")) {
uri = new Uri (Path.Combine("ssh://git@github.com", uri.LocalPath));
uri = new Uri ("ssh://git@github.com" + uri.AbsolutePath);
} else if (uri.Host.Equals ("bitbucket.org") && !uri.Scheme.StartsWith ("http")) {
// Nothing really
@ -96,9 +96,9 @@ namespace SparkleLib.Git {
} else {
if (string.IsNullOrEmpty (uri.UserInfo) && !uri.Scheme.StartsWith ("http")) {
if (uri.Port == -1)
uri = new Uri (Path.Combine (uri.Scheme + "://storage@" + uri.Host, uri.LocalPath));
uri = new Uri (uri.Scheme + "://storage@" + uri.Host + uri.AbsolutePath);
else
uri = new Uri (Path.Combine (uri.Scheme + "://storage@" + uri.Host + ":" + uri.Port, uri.LocalPath));
uri = new Uri (uri.Scheme + "://storage@" + uri.Host + ":" + uri.Port + uri.AbsolutePath);
}
this.use_git_bin = false; // TODO

4
SparkleLib/SparkleFetcherBase.cs
View file

@ -165,7 +165,7 @@ namespace SparkleLib {
IsActive = false;
bool repo_is_encrypted = (RemoteUrl.LocalPath.Contains ("-crypto") ||
bool repo_is_encrypted = (RemoteUrl.AbsolutePath.Contains ("-crypto") ||
RemoteUrl.Host.Equals ("sparkleshare.net"));
Finished (repo_is_encrypted, IsFetchedRepoEmpty, Warnings);
@ -225,7 +225,7 @@ namespace SparkleLib {
n +
"Have fun! :)" + n;
if (RemoteUrl.LocalPath.Contains ("-crypto") || RemoteUrl.Host.Equals ("sparkleshare.net"))
if (RemoteUrl.AbsolutePath.Contains ("-crypto") || RemoteUrl.Host.Equals ("sparkleshare.net"))
text = text.Replace ("a SparkleShare repository", "an encrypted SparkleShare repository");
File.WriteAllText (file_path, text);

2
SparkleShare/SparkleControllerBase.cs
View file

@ -641,7 +641,7 @@ namespace SparkleShare {
this.watcher.EnableRaisingEvents = false;
this.fetcher.Complete ();
string canonical_name = Path.GetFileName (this.fetcher.RemoteUrl.LocalPath);
string canonical_name = Path.GetFileName (this.fetcher.RemoteUrl.AbsolutePath);
canonical_name = canonical_name.Replace ("-crypto", "");
canonical_name = canonical_name.Replace ("_", " ");

2
SparkleShare/SparkleSetupController.cs
View file

@ -392,7 +392,7 @@ namespace SparkleShare {
Uri uri = new Uri (remote_url);
try {
string address = uri.ToString ().Replace (uri.LocalPath, "");
string address = remote_url.Replace (uri.AbsolutePath, "");
new_plugin = SparklePlugin.Create (uri.Host, address, address, "", "", "/path/to/project");

2
SparkleShare/Windows/SparkleShare.wxs
View file

@ -2,7 +2,7 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Name='SparkleShare' Id='184950D5-67F6-4D06-9717-7E2F1607A7B0' UpgradeCode='D3DF1D99-87F5-47A7-A349-863DD6E4B73A'
Language='1033' Codepage='1252' Version='1.0.0' Manufacturer='SparkleShare'>
Language='1033' Codepage='1252' Version='1.1.0' Manufacturer='SparkleShare'>
<Package Id='*' Keywords='Installer' Description="SparkleShare Setup" Manufacturer='SparkleShare'
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />

2
configure.ac
View file

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
m4_define([sparkleshare_version], [1.0.0])
m4_define([sparkleshare_version], [1.1.0])
AC_PREREQ([2.54])
AC_INIT([SparkleShare], sparkleshare_version)