summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile38
-rw-r--r--debian/changelog2
-rw-r--r--debian/control5
-rw-r--r--docs/pwgrep.pod2
-rw-r--r--docs/pwgrep.txt2
5 files changed, 19 insertions, 30 deletions
diff --git a/Makefile b/Makefile
index bfc7075..dafce79 100644
--- a/Makefile
+++ b/Makefile
@@ -12,35 +12,22 @@ install:
test ! -d $(DESTDIR)/usr/bin && mkdir -p $(DESTDIR)/usr/bin || exit 0
test ! -d $(DESTDIR)/usr/share/$(NAME) && mkdir -p $(DESTDIR)/usr/share/$(NAME) || exit 0
test ! -d $(DESTDIR)/usr/share/man/man1 && mkdir -p $(DESTDIR)/usr/share/man/man1 || exit 0
- cp ./docs/$(NAME).1.gz $(DESTDIR)/usr/share/man/man1/$(NAME).1.gz
cp ./bin/$(NAME).sh $(DESTDIR)/usr/share/$(NAME)/
chmod 755 ./bin/$(NAME).sh $(DESTDIR)/usr/share/$(NAME)/$(NAME).sh
-
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/fwipe
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/pwdbls
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/pwedit
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/pwfadd
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/pwfcat
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/pwfdel
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/pwfls
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/pwgrep
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/pwhelp
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/pwldb
- ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/pwupdate
+ cp ./docs/$(NAME).1.gz $(DESTDIR)/usr/share/man/man1/$(NAME).1.gz
+ bash -c 'for i in fwipe pwdbls pwedit pwfadd pwfcat pwfdel pwfls pwgrep \
+ pwhelp pwldb pwupdate; do \
+ ln -s $(DESTDIR)/share/$(NAME)/$(NAME).sh $(DESTDIR)/usr/bin/$$i; \
+ cp ./docs/$(NAME).1.gz $(DESTDIR)/usr/share/man/man1/$$i.1.gz; \
+ done 2>/dev/null || exit 0'
deinstall:
- rm $(DESTDIR)/fwipe 2>/dev/null || exit 0
- rm $(DESTDIR)/pwdbls 2>/dev/null || exit 0
- rm $(DESTDIR)/pwedit 2>/dev/null || exit 0
- rm $(DESTDIR)/pwfadd 2>/dev/null || exit 0
- rm $(DESTDIR)/pwfcat 2>/dev/null || exit 0
- rm $(DESTDIR)/pwfdel 2>/dev/null || exit 0
- rm $(DESTDIR)/pwfls 2>/dev/null || exit 0
- rm $(DESTDIR)/pwgrep 2>/dev/null || exit 0
- rm $(DESTDIR)/pwhelp 2>/dev/null || exit 0
- rm $(DESTDIR)/pwldb 2>/dev/null || exit 0
- rm $(DESTDIR)/pwupdate 2>/dev/null || exit 0
- -d $(DESTDIR)/usr/share/$(NAME) && rm -r $(DESTDIR)/usr/share/$(NAME) || exit 0
+ bash -c 'for i in fwipe pwdbls pwedit pwfadd pwfcat pwfdel pwfls pwgrep \
+ pwhelp pwldb pwupdate; do \
+ rm $(DESTDIR)/usr/bin/$$i; \
+ rm $(DESTDIR)/usr/share/man/man1/$$i.1.gz; \
+ done 2>/dev/null || exit 0'
+ test -d $(DESTDIR)/usr/share/$(NAME) && rm -r $(DESTDIR)/usr/share/$(NAME) || exit 0
test -f $(DESTDIR)/usr/share/man/man1/$(NAME).1.gz && rm -f $(DESTDIR)/usr/share/man/man1/$(NAME).1.gz || exit 0
uninstall: deinstall
@@ -57,6 +44,7 @@ version:
documentation:
pod2man --release="$(NAME) $$(cat .version)" \
--center="User Commands" ./docs/$(NAME).pod > ./docs/$(NAME).1
+ [ -f ./docs/$(NAME).1.gz ] && rm -f ./docs/$(NAME).1.gz
gzip ./docs/$(NAME).1
pod2text ./docs/$(NAME).pod > ./docs/$(NAME).txt
diff --git a/debian/changelog b/debian/changelog
index 0ee77f4..eef4dcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,7 +86,7 @@ pwgrep (0.8.3) stable; urgency=low
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
+ anymore. Useful 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
diff --git a/debian/control b/debian/control
index 40985b0..0dd8024 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Vcs-Browser: http://web.buetow.org/git/?p=pwgrep.git;a=summary
Package: pwgrep
Architecture: all
-Depends: vim, git, bash, awk
+Depends: vim, git, gawk
Description: Simple password manager
- This is just a simple password manager for the console programmed in bash and some awk using Vim and GnuPG and Git.
+ This is just a simple password manager for the console programmed in bash
+ and some awk using Vim and GnuPG and Git.
diff --git a/docs/pwgrep.pod b/docs/pwgrep.pod
index 96156fd..8a8af70 100644
--- a/docs/pwgrep.pod
+++ b/docs/pwgrep.pod
@@ -22,4 +22,4 @@ Where OPTS are:
=head1 Tutorial
-Please go to L<http://pwgrep.buetow.org> .
+Please go to L<http://pwgrep.buetow.org>.
diff --git a/docs/pwgrep.txt b/docs/pwgrep.txt
index d562cef..a77a7c7 100644
--- a/docs/pwgrep.txt
+++ b/docs/pwgrep.txt
@@ -17,5 +17,5 @@ Synopsis
- Searching all available DBs or categories at once
Tutorial
- Please go to <http://pwgrep.buetow.org> .
+ Please go to <http://pwgrep.buetow.org>.