Merge branch 'release/1.1.3'

cryptomator · Jun 6, 2019 · 1fe2afa · 1fe2afa
2 parents e54636b + 34282ab
commit 1fe2afa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,11 +18,14 @@
 *.tar.gz
 *.rar
 
+# Maven #
+target/
+pom.xml.versionsBackup
+
 # Eclipse Settings Files #
 .settings
 .project
 .classpath
-target/
 test-output/
 
 # IntelliJ Settings Files #

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>fuse-nio-adapter</artifactId>
-	<version>1.1.2</version>
+	<version>1.1.3</version>
 	<name>FUSE-NIO-Adapter</name>
 	<description>Access resources at a given NIO path via FUSE.</description>
 	<url>https://github.com/cryptomator/fuse-nio-adapter</url>

diff --git a/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxMounter.java b/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxMounter.java
@@ -8,7 +8,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
 
 class LinuxMounter implements Mounter {
 
@@ -40,9 +39,9 @@ private LinuxMount(Path directory, EnvironmentVariables envVars) {
 			Path mountPoint = envVars.getMountPath();
 			String[] command = envVars.getRevealCommand().orElse(DEFAULT_REVEALCOMMAND_LINUX).split("\\s+");
 			this.revealCommand = new ProcessBuilder(ObjectArrays.concat(command, mountPoint.toString()));
-			this.unmountCommand = new ProcessBuilder("fusermount", "-u", mountPoint.getFileName().toString());
+			this.unmountCommand = new ProcessBuilder("fusermount", "-u", "--", mountPoint.getFileName().toString());
 			this.unmountCommand.directory(mountPoint.getParent().toFile());
-			this.unmountForcedCommand = new ProcessBuilder("fusermount", "-u", "-z", mountPoint.getFileName().toString());
+			this.unmountForcedCommand = new ProcessBuilder("fusermount", "-u", "-z", "--", mountPoint.getFileName().toString());
 			this.unmountForcedCommand.directory(mountPoint.getParent().toFile());
 		}
 

diff --git a/src/main/java/org/cryptomator/frontend/fuse/mount/MacMounter.java b/src/main/java/org/cryptomator/frontend/fuse/mount/MacMounter.java
@@ -16,7 +16,6 @@
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
 
 class MacMounter implements Mounter {
 
@@ -99,9 +98,9 @@ private MacMount(Path directory, EnvironmentVariables envVars) {
 			Path mountPoint = envVars.getMountPath();
 			this.revealCommand = new ProcessBuilder("open", ".");
 			this.revealCommand.directory(mountPoint.toFile());
-			this.unmountCommand = new ProcessBuilder("umount", mountPoint.getFileName().toString());
+			this.unmountCommand = new ProcessBuilder("umount", "--", mountPoint.getFileName().toString());
 			this.unmountCommand.directory(mountPoint.getParent().toFile());
-			this.unmountForcedCommand = new ProcessBuilder("umount", "-f", mountPoint.getFileName().toString());
+			this.unmountForcedCommand = new ProcessBuilder("umount", "-f", "--", mountPoint.getFileName().toString());
 			this.unmountForcedCommand.directory(mountPoint.getParent().toFile());
 		}