summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-11-26 13:29:41 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-11-26 13:29:41 -0200
commit4cf8a17cfbe2a0b2af659f4b75d16e746d976ab6 (patch)
tree0088e84186c9d6914aeb648c6b8c4d4a1dd8727a
parent5ec8ec353ecd15b3d71479d2fcca3346059f955c (diff)
downloadkeyringer-4cf8a17cfbe2a0b2af659f4b75d16e746d976ab6.tar.gz
keyringer-4cf8a17cfbe2a0b2af659f4b75d16e746d976ab6.tar.bz2
Set .gitignore during initialization and when using tmp inside the repository
-rwxr-xr-xkeyringer1
-rwxr-xr-xlib/keyringer/functions4
2 files changed, 4 insertions, 1 deletions
diff --git a/keyringer b/keyringer
index bdb1f6c..922f490 100755
--- a/keyringer
+++ b/keyringer
@@ -90,6 +90,7 @@ function keyringer_init {
# Init
if ! keyringer_is_git "$BASEDIR"; then
keyringer_exec git "$BASEDIR" init
+ keyringer_git_ignore 'tmp/*'
# Edit default recipients
echo "Now you have to edit the default recipient configuration to be able to encrypt secrets."
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index a278caf..53afd1d 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -153,6 +153,9 @@ function keyringer_set_tmpfile {
echo "Press any key to continue, Ctrl-C to abort"
read key
tmp="$BASEDIR/tmp"
+
+ # Just to be sure
+ keyringer_git_ignore 'tmp/*'
fi
# Determine template
@@ -163,7 +166,6 @@ function keyringer_set_tmpfile {
fi
mkdir -p "$tmp"
- keyringer_git_ignore 'tmp/*'
if [ "$2" == "-d" ]; then
TMPWORK="$(mktemp -d "$template")"