aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Richey <joerichey94@gmail.com>2017-10-19 03:02:00 -0700
committerJoseph Richey <joerichey94@gmail.com>2017-10-19 03:02:00 -0700
commit5f66408c9e2b50756a15fd821fe397a4723da7b6 (patch)
treec4faba3e301f09afe421a566e6adb6b6e69b676e
parentb7295ee7e3514f616d03a4c0ab391db22d6ab315 (diff)
Makefile and .gitignore cleanup
Our .gitignore file was overly restrictive, fixed to only include the fscrypt binary. Also, our build tags were incorrectly formatted. The tags are removed and the corresponding lint rule is simplified. The build tags will be added back after the refactor.
-rw-r--r--.gitignore1
-rw-r--r--Makefile2
-rw-r--r--cmd/fscrypt/fscrypt.go6
-rw-r--r--pam_fscrypt/pam_fscrypt.go2
4 files changed, 1 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 345dfa1..09289e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
fscrypt
-fscrypt.*
fscrypt_image
pam_fscrypt.so
.vscode
diff --git a/Makefile b/Makefile
index a28522e..35cf732 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ format-check:
# Run lint rules (skipping generated files)
.PHONY: lint
lint:
- @go tool vet -buildtags=false .
+ @go tool vet .
@golint $(GO_PKGS) | grep -v "pb.go" | ./input_fail.py
@megacheck -unused.exported $(GO_PKGS)
diff --git a/cmd/fscrypt/fscrypt.go b/cmd/fscrypt/fscrypt.go
index d6162f6..b1a5fe5 100644
--- a/cmd/fscrypt/fscrypt.go
+++ b/cmd/fscrypt/fscrypt.go
@@ -18,12 +18,6 @@
* the License.
*/
-/*
-fscrypt is a command line tool for managing linux filesystem encryption.
-*/
-
-// +build linux,cgo
-
package main
import (
diff --git a/pam_fscrypt/pam_fscrypt.go b/pam_fscrypt/pam_fscrypt.go
index 571a42b..e611bc6 100644
--- a/pam_fscrypt/pam_fscrypt.go
+++ b/pam_fscrypt/pam_fscrypt.go
@@ -17,8 +17,6 @@
* the License.
*/
-// +build linux,cgo
-
package main
/*