mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-04 07:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fixes folder creation and automounting on Linux

Browse Source 
- using IPv6 address for mounting on Windows only (hostnames on OS X and Linux)
This commit is contained in:
Sebastian Stenzel
2015-02-22 21:04:46 +01:00
parent 676cb10ef0
commit 507e21f8a3
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/ui/src/main/java/org/cryptomator/ui/util/mount/LinuxGvfsWebDavMounter.java
+5 -7
View File
@@ -40,15 +40,13 @@ final class LinuxGvfsWebDavMounter implements WebDavMounterStrategy {
public WebDavMount mount(URI uri, String name) throws CommandFailedException {
final Script mountScript = Script.fromLines(
"set -x",
"gvfs-mount \"dav://localhost:$DAV_PORT$DAV_PATH\"",
"xdg-open \"dav://localhost:$DAV_PORT$DAV_PATH\"")
.addEnv("DAV_PORT", String.valueOf(uri.getPort()))
.addEnv("DAV_PATH", uri.getRawPath());
"gvfs-mount \"dav:$DAV_SSP\"",
"xdg-open \"dav:$DAV_SSP\"")
.addEnv("DAV_SSP", uri.getRawSchemeSpecificPart());
final Script unmountScript = Script.fromLines(
"set -x",
"gvfs-mount -u \"dav://localhost:$DAV_PORT$DAV_PATH\"")
.addEnv("DAV_PORT", String.valueOf(uri.getPort()))
.addEnv("DAV_PATH", uri.getRawPath());
"gvfs-mount -u \"dav:$DAV_SSP\"")
.addEnv("DAV_SSP", uri.getRawSchemeSpecificPart());
mountScript.execute();
return new WebDavMount() {
@Override
main/ui/src/main/java/org/cryptomator/ui/util/mount/MacOsXWebDavMounter.java
+2 -2
View File
@@ -31,9 +31,9 @@ final class MacOsXWebDavMounter implements WebDavMounterStrategy {
final String path = "/Volumes/Cryptomator" + uri.getRawPath().replace('/', '_');
final Script mountScript = Script.fromLines(
"mkdir \"$MOUNT_PATH\"",
"mount_webdav -S -v $MOUNT_NAME \"[::1]:$PORT$DAV_PATH\" \"$MOUNT_PATH\"",
"mount_webdav -S -v $MOUNT_NAME \"$DAV_AUTHORITY$DAV_PATH\" \"$MOUNT_PATH\"",
"open \"$MOUNT_PATH\"")
.addEnv("PORT", String.valueOf(uri.getPort()))
.addEnv("DAV_AUTHORITY", uri.getRawAuthority())
.addEnv("DAV_PATH", uri.getRawPath())
.addEnv("MOUNT_PATH", path)
.addEnv("MOUNT_NAME", name);