aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2015-10-11 17:14:18 +0200
committerJakob Unterwurzacher2015-10-11 17:14:18 +0200
commit5dc7e44aa2cb6527b0e2f4e7108c8cbd7c2a72c1 (patch)
tree30c9c35c0aaa5646ba90fee3efdfe4ea62550fed
parent6825d0e7406b8e761daca63770e28842bed5fd85 (diff)
Move main files to top level dir
This is in preparation of getting rid of the shell wrapper
-rw-r--r--.gitignore2
-rwxr-xr-xbuild.bash1
l---------gocryptfs1
-rw-r--r--main.go (renamed from gocryptfs_main/main.go)0
-rw-r--r--main_test.go (renamed from gocryptfs_main/main_test.go)0
-rw-r--r--masterkey.go (renamed from gocryptfs_main/masterkey.go)0
-rw-r--r--password.go (renamed from gocryptfs_main/password.go)0
-rw-r--r--sendsig.go (renamed from gocryptfs_main/sendsig.go)0
8 files changed, 1 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 22ad0f7..69001ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
# binary
-/gocryptfs_main/gocryptfs_main
+/gocryptfs
# temporary files created by the tests
/tmp
diff --git a/build.bash b/build.bash
index ab55293..8d985d0 100755
--- a/build.bash
+++ b/build.bash
@@ -2,5 +2,4 @@
set -eu
-cd gocryptfs_main
go build
diff --git a/gocryptfs b/gocryptfs
deleted file mode 120000
index 2e2bf98..0000000
--- a/gocryptfs
+++ /dev/null
@@ -1 +0,0 @@
-gocryptfs_main/gocryptfs \ No newline at end of file
diff --git a/gocryptfs_main/main.go b/main.go
index 912ff72..912ff72 100644
--- a/gocryptfs_main/main.go
+++ b/main.go
diff --git a/gocryptfs_main/main_test.go b/main_test.go
index f171a8c..f171a8c 100644
--- a/gocryptfs_main/main_test.go
+++ b/main_test.go
diff --git a/gocryptfs_main/masterkey.go b/masterkey.go
index 69f268c..69f268c 100644
--- a/gocryptfs_main/masterkey.go
+++ b/masterkey.go
diff --git a/gocryptfs_main/password.go b/password.go
index 821ecb4..821ecb4 100644
--- a/gocryptfs_main/password.go
+++ b/password.go
diff --git a/gocryptfs_main/sendsig.go b/sendsig.go
index d0e1cbb..d0e1cbb 100644
--- a/gocryptfs_main/sendsig.go
+++ b/sendsig.go