summaryrefslogtreecommitdiff
path: root/pass
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xpassword-store.sh44
1 files changed, 41 insertions, 3 deletions
diff --git a/password-store.sh b/password-store.sh
index 4730133..58e7dcd 100755
--- a/password-store.sh
+++ b/password-store.sh
@@ -4,6 +4,10 @@ umask 077
PREFIX="$HOME/.password-store"
ID="$PREFIX/.gpg-id"
+GIT="$PREFIX/.git"
+
+export GIT_DIR="$GIT"
+export GIT_WORK_TREE="$PREFIX"
usage() {
cat <<_EOF
@@ -24,6 +28,10 @@ Usage:
Generate a new password of pass-length with optionally no symbols.
$0 --remove pass-name
Remove existing password.
+ $0 --push
+ If the password store is a git repository, push the latest changes.
+ $0 --pull
+ If the password store is a git repository, pull the latest changes.
$0 --help
Show this text.
_EOF
@@ -68,13 +76,18 @@ elif [[ $1 == "--insert" ]]; then
fi
mkdir -p -v "$PREFIX/$(dirname "$2")"
+ passfile="$PREFIX/$2.gpg"
if [[ $ml -eq 0 ]]; then
echo -n "Enter password for $2: "
- head -n 1 | gpg -e -r "$ID" > "$PREFIX/$2.gpg"
+ head -n 1 | gpg -e -r "$ID" > "$passfile"
else
echo "Enter contents of $2 and press Ctrl+D when finished:"
echo
- cat | gpg -e -r "$ID" > "$PREFIX/$2.gpg"
+ cat | gpg -e -r "$ID" > "$passfile"
+ fi
+ if [[ -d $GIT ]]; then
+ git add "$passfile"
+ git commit -m "Added given password for $2 to store."
fi
elif [[ $1 == "--generate" ]]; then
if [[ $# -lt 3 ]]; then
@@ -92,7 +105,12 @@ elif [[ $1 == "--generate" ]]; then
fi
mkdir -p -v "$PREFIX/$(dirname "$2")"
pass="$(pwgen -s $symbols $3 1)"
- echo $pass | gpg -e -r "$ID" > "$PREFIX/$2.gpg"
+ passfile="$PREFIX/$2.gpg"
+ echo $pass | gpg -e -r "$ID" > "$passfile"
+ if [[ -d $GIT ]]; then
+ git add "$passfile"
+ git commit -m "Added generated password for $2 to store."
+ fi
echo "The generated password to $2 is:"
echo "$pass"
elif [[ $1 == "--remove" ]]; then
@@ -106,6 +124,26 @@ elif [[ $1 == "--remove" ]]; then
exit 1
fi
rm -i -v "$passfile"
+ if [[ -d $GIT ]] && ! [[ -f "$passfile" ]]; then
+ git rm -f "$passfile"
+ git commit -m "Removed $2 from store."
+ fi
+elif [[ $1 == "--push" ]]; then
+ if [[ -d $GIT ]]; then
+ shift
+ exec git push $@
+ else
+ echo "Error: the password store is not a git repository."
+ exit 1
+ fi
+elif [[ $1 == "--pull" ]]; then
+ if [[ -d $GIT ]]; then
+ shift
+ exec git pull $@
+ else
+ echo "Error: the password store is not a git repository."
+ exit 1
+ fi
elif [[ $# -eq 1 ]]; then
passfile="$PREFIX/$1.gpg"
if ! [[ -f $passfile ]]; then
08-07-08 14:15:04 +0200'>2008-07-08Documented the plugin moduleRené 'Necoro' Neumann2-32/+229 2008-07-04Ported remaining pluginsRené 'Necoro' Neumann6-89/+100 2008-07-04Removed lxml version in error stringRené 'Necoro' Neumann1-2/+1 2008-07-04Removed lxml version in error stringRené 'Necoro' Neumann1-3/+1 2008-07-04Ignore errors on plugin loadingRené 'Necoro' Neumann1-0/+6 2008-07-04Added ability to install missing plugin depsRené 'Necoro' Neumann3-95/+126 2008-07-04Fixed find_best_match for <portage-2.1.5René 'Necoro' Neumann1-2/+2 2008-07-04Some more dependency awarenessRené 'Necoro' Neumann5-23/+59 2008-07-03Some window refinementRené 'Necoro' Neumann1-109/+126 2008-07-03Removed XSD_LOCATION -- as there is no more xsd ;)René 'Necoro' Neumann2-5/+1 2008-07-03Updated setup.py to install the correct set of pluginsRené 'Necoro' Neumann1-3/+2 2008-07-03Ported etc-proposals pluginRené 'Necoro' Neumann3-50/+43 2008-07-03Ported gpytage pluginRené 'Necoro' Neumann2-16/+14 2008-07-03Ported Notify pluginRené 'Necoro' Neumann4-37/+51 2008-07-03Remove xsd and -x cmdline optionRené 'Necoro' Neumann2-107/+1 2008-07-03Ported completelyRené 'Necoro' Neumann3-548/+54 2008-07-03Should show dependencies nowRené 'Necoro' Neumann2-82/+128 2008-07-03Use __slots__ for the PkgData class to save memoryRené 'Necoro' Neumann1-2/+3 2008-07-03New plugin system - first hackRené 'Necoro' Neumann2-420/+683 2008-06-30Now the new design is able to do the same as the old oneRené 'Necoro' Neumann3-168/+182 2008-06-30First draft of the new plugin windowRené 'Necoro' Neumann1-8/+172 2008-06-30Added stuff to plugin.pyRené 'Necoro' Neumann1-2/+24 2008-06-30Beautified some dialogsRené 'Necoro' Neumann1-6/+8 2008-06-30Only add a package to mergequeue if everything went fineRené 'Necoro' Neumann1-1/+1 2008-06-26Removed '__find_resolved_unresolved' as it is quite useless.René 'Necoro' Neumann3-53/+29 2008-06-26Added very basic set queryingRené 'Necoro' Neumann3-0/+27 2008-06-25Now load 22 versions when running the correct portageRené 'Necoro' Neumann4-8/+18 2008-06-25Added Package_22 and System_22René 'Necoro' Neumann4-5/+63