some stuff see changelog

2 files changed, 33 insertions, 21 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6c9c0e8..d4bc4f1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,23 +1,28 @@
-Tue Sep  7 20:41:04 CEST 2010
-v0.6 release branched
+Sun Sep 19 12:29:06 CEST 2010 - v0.7-pre-1 
+* New format of the CHANGELOG.txt (it's not GNU style)
+* No VERSIONUPDATE on pwgrep, pwfls, pwfcat anymore
+* Introduced new command pwupdate which will check out the newest version
+from the repository.
 
-Fri Jul 30 23:31:12 CEST 2010
-v0.5-pre-3 - new command pwdbls, which lists all databases available.
-pwldb is a synonym for pwdbls. Changed the default database name 
+Tue Sep  7 20:41:04 CEST 2010 - v0.6 release branched
+
+Fri Jul 30 23:31:12 CEST 2010 - v0.5-pre-3 
+* New command pwdbls, which lists all databases available.
+* pwldb is a synonym for pwdbls. Changed the default database name 
 (database.gpg => mydb.gpg) 
 
-Wed Jul 28 18:44:03 CEST 2010
-v0.5-pre-2 - new option -d DATABASE, so its multi database capable now
+Wed Jul 28 18:44:03 CEST 2010 - v0.5-pre-2 
+* New option -d DATABASE, so its multi database capable now
 
-Wed Jul 28 18:16:09 CEST 2010
-v0.5-pre-1 - pwfcat redirects all informational message to stderr. means 
+Wed Jul 28 18:16:09 CEST 2010 - v0.5-pre-1 
+* pwfcat redirects all informational message to stderr. means 
 pwfcat includes no informational messages in stdout of pwgrep itself 
 anymore. Usefull for piping the content do another process or for 
 redirecting it into a file.
 
-Sun Jul 18 10:10:29 CEST 2010
-v0.5-pre-0 - Offlinemode support (Option -o) which does not use the 
-versioning system (usable if there is no internet connection available 
+Sun Jul 18 10:10:29 CEST 2010 v0.5-pre-0 
+* Offlinemode support (Option -o) which does not use the versioning system 
+(usable if there is no internet connection available 
 atm).  e.g. "pwgrep -o foobar"
 
 
diff --git a/pwgrep.sh b/pwgrep.sh
index c6d0a44..74a5e7b 100755
--- a/pwgrep.sh
+++ b/pwgrep.sh
@@ -1,6 +1,6 @@
 #!/bin/bash 
 
-# pwgrep v0.7-pre-00 (c) 2009, 2010 by Paul C. Buetow
+# pwgrep v0.7-pre-1 (c) 2009, 2010 by Paul C. Buetow
 # pwgrep helps you to manage all your passwords using GnuGP
 # for encryption and a versioning system (subversion by default)
 # for keeping track all changes of your password database. In
@@ -20,6 +20,7 @@
 # For more reasonable commands the following symlinks are recommended: 
 #	ln -s ~/svn/pwgrep/v?.?/pwgrep.sh ~/bin/pwgrep
 #	ln -s ~/svn/pwgrep/v?.?/pwgrep.sh ~/bin/pwedit
+#	ln -s ~/svn/pwgrep/v?.?/pwgrep.sh ~/bin/pwupdate
 #	ln -s ~/svn/pwgrep/v?.?/pwgrep.sh ~/bin/pwfls
 #	ln -s ~/svn/pwgrep/v?.?/pwgrep.sh ~/bin/pwfcat
 #	ln -s ~/svn/pwgrep/v?.?/pwgrep.sh ~/bin/pwfadd
@@ -125,7 +126,6 @@ function setwipecmd {
 
 function pwgrep () {
 	search=$1
-	[ -z $NOVERSIONING ] && $VERSIONUPDATE 2>&1 >/dev/null
 	info Searching for $search
 
 	gpg --decrypt $PWGREPDB | $AWK -v search="$search" '
@@ -147,8 +147,14 @@ function pwgrep () {
 		}' 
 }
 
+function pwupdate () {
+   if [ -z $NOVERSIONING ]; then
+         info Updating repository
+         $VERSIONUPDATE 2>&1 >/dev/null
+   fi
+}
 function pwedit () {
-	[ -z $NOVERSIONING ] && $VERSIONUPDATE 2>&1 >/dev/null
+   pwupdate
 	cp -vp $PWGREPDB $PWGREPDB.`date +'%s'`.snap && \
 	gpg --decrypt $PWGREPDB > .database && \
 	vim --cmd 'set noswapfile' --cmd 'set nobackup' \
@@ -160,7 +166,7 @@ function pwedit () {
 }
 
 function pwdbls () {
-	[ -z $NOVERSIONING ] && $VERSIONUPDATE 2>&1 >/dev/null
+   pwupdate
    echo Available Databases:
    ls *.gpg | sed 's/\.gpg$//'
    echo Default database: $DEFAULTPWGREPDB
@@ -168,7 +174,6 @@ function pwdbls () {
 
 function pwfls () {
 	name=`echo $1 | sed 's/.gpg$//'`
-	[ -z $NOVERSIONING ] && $VERSIONUPDATE 2>&1 >/dev/null
 
 	[ ! -e $PWFILEDIREXT ] && error $PWFILEDIREXT does not exist
 
@@ -194,8 +199,7 @@ function pwfadd () {
 		outfile=`basename $name`
 	fi
 
-	[ -z $NOVERSIONING ] && $VERSIONUPDATE 2>&1 >/dev/null
-
+   pwupdate
 
 	[ ! -e $PWFILEWORKDIR ] && error $PWFILEWORKDIR does not exist
 	[ -z $name ] && error Missing argument 
@@ -209,8 +213,7 @@ function pwfadd () {
 
 function pwfdel () {
 	name=`echo $1 | sed 's/.gpg$//'`
-	[ -z $NOVERSIONING ] && $VERSIONUPDATE 2>&1 >/dev/null
-
+   pwupdate
 
 	[ ! -e $PWFILEWORKDIR ] && error $PWFILEWORKDIR does not exist
 	[ -z $name ] && error Missing argument 
@@ -261,8 +264,12 @@ set_opts $ARGS
 
 case $BASENAME in 
 	pwgrep) 
+      NOVERSIONING=1
 		pwgrep $ARGS
 	;;
+	pwupdate) 
+      pwupdate
+	;;
 	pwedit) 
 		pwedit
 	;;