Adding keyringer_git_ignore

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index dd0de032edfe6f5e894cb71c498d006cf83b2e4a..22f16f85fecf88e2c32fe4ce1bf8dbc46523d806 100644 (file)
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -112,22 +112,23 @@ function keyringer_set_tmpfile {
     exit 1
   fi
 
-  mkdir -p $BASEDIR/tmp
-
   if [ -z "$1" ]; then
     template="$BASEDIR/tmp/keyringer.XXXXXXXXXX"
   else
     template="$BASEDIR/tmp/$1.XXXXXXXXXX"
   fi
 
-  TMPFILE="`mktemp $template`" || exit 1
+  mkdir -p $BASEDIR/tmp
+  keyringer_git_ignore 'tmp/*'
+
+  tmpfile="`mktemp $template`"
   
   if [ "$?" != "0" ]; then
-    echo "Error: can't set tmpfile $TMPFILE"
+    echo "Error: can't set tmpfile $tmpfile"
     exit 1
   fi
 
-  echo $TMPFILE
+  echo $tmpfile
 }
 
 # Remove a temporary file
@@ -143,3 +144,15 @@ function keyringer_unset_tmpfile {
     exit 1
   fi
 }
+
+# Add a pattern into gitignore
+function keyringer_git_ignore {
+  if [ ! -z "$BASEDIR/.gitignore" ]; then
+    echo $1 > $BASEDIR/.gitignore
+    keyringer_exec git $BASEDIR add .gitignore
+  else
+    if ! grep -q -e "^$1$" $BASEDIR/.gitignore; then
+      echo $1 >> $BASEDIR/.gitignore
+    fi
+  fi
+}

diff --git a/share/keyringer/edit b/share/keyringer/edit
index 153e23682212eedfd44f7001a2fa128e280406c1..b5cc4ae9cd355f2a157dfbdda28555b6e7231d02 100755 (executable)
--- a/share/keyringer/edit
+++ b/share/keyringer/edit
@@ -8,6 +8,7 @@ LIB="`dirname $0`/../../lib/keyringer/functions"
 source $LIB
 
 # Config
+ACTIONS="`dirname $0`"
 BASEDIR="$1"
 FILE="`keyringer_filename $2`"
 KEYDIR="$BASEDIR/keys"