From b00fc379c4d18ca848b5ded70549120755a509c4 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher <jakobunt@gmail.com>
Date: Sun, 11 Oct 2015 18:36:07 +0200
Subject: [PATCH] Fix helper scripts for new top-level path

---
 benchmark.bash | 2 --
 main_test.go   | 4 ++--
 package.bash   | 3 +--
 test.bash      | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/benchmark.bash b/benchmark.bash
index baba0f1..447581a 100755
--- a/benchmark.bash
+++ b/benchmark.bash
@@ -2,7 +2,5 @@
 
 set -eux
 
-cd gocryptfs_main
-
 go build
 go test -bench=.
diff --git a/main_test.go b/main_test.go
index f171a8c..b4dff95 100644
--- a/main_test.go
+++ b/main_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 )
 
-const tmpDir = "../tmp/"
+const tmpDir = "tmp/"
 const plainDir = tmpDir + "plain/"
 const cipherDir = tmpDir + "cipher/"
 
@@ -21,7 +21,7 @@ func mount(extraArgs ...string) {
 	args = append(args, extraArgs...)
 	args = append(args, cipherDir)
 	args = append(args, plainDir)
-	c := exec.Command("../gocryptfs", args...)
+	c := exec.Command("./gocryptfs", args...)
 	c.Stdout = os.Stdout
 	c.Stderr = os.Stderr
 	err := c.Run()
diff --git a/package.bash b/package.bash
index aeb52b2..61df904 100755
--- a/package.bash
+++ b/package.bash
@@ -3,6 +3,5 @@
 set -eux
 
 tag=$(git describe --tags)
-cd gocryptfs_main
 go build
-tar czvf ../gocryptfs_$tag.tar.gz gocryptfs gocryptfs_main
+tar czvf gocryptfs_$tag.tar.gz gocryptfs
diff --git a/test.bash b/test.bash
index a6f98be..8eadfab 100755
--- a/test.bash
+++ b/test.bash
@@ -2,10 +2,9 @@
 
 set -eux
 
-cd cryptfs
 go build
 go test
 
-cd ../gocryptfs_main
+cd cryptfs
 go build
 go test