Re-organize the project into a better hierarchy.

platform-independent/cli-java/src/main/scripts/install

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#
+# Install the Master Password CLI tool.
+set -e
+cd "${BASH_SOURCE%/*}"
+source bashlib
+
+inf "This will install the mpw tool."
+
+# Try to guess then ask for the bin dir to install to.
+IFS=: read -a paths <<< "$PATH"
+if inArray ~/bin "${paths[@]}"; then
+    bindir=~/bin
+elif inArray ~/.bin "${paths[@]}"; then
+    bindir=~/.bin
+elif inArray /usr/local/bin "${paths[@]}"; then
+    bindir=/usr/local/bin
+else
+    bindir=~/bin
+fi
+bindir=$(ask -d "$bindir" "What bin directory should I install to?")
+[[ -d "$bindir" ]] || mkdir "$bindir" || ftl 'Cannot create missing bin directory: %s' "$bindir" || exit
+[[ -w "$bindir" ]] || ftl 'Cannot write to bin directory: %s' "$bindir" || exit
+
+# Try to guess then ask for the share dir to install to.
+sharedir=$(cd -P "$bindir/.."; [[ $bindir = */.bin ]] && printf '%s/.share' "$PWD" || printf '%s/share' "$PWD")
+sharedir=$(ask -d "$sharedir" "What share directory should I install to?")
+[[ -d "$sharedir" ]] || mkdir "$sharedir" || ftl 'Cannot create missing share directory: %s' "$sharedir" || exit
+[[ -w "$sharedir" ]] || ftl 'Cannot write to share directory: %s' "$sharedir" || exit
+
+# Install Master Password.
+sharepath=$sharedir/masterpassword
+mkdir -p "$sharepath"
+cp -a "masterpassword-cli-"*".jar" bashlib mpw "$sharepath"
+ex -c "%s~%SHAREPATH%~$sharepath~g|x" "$sharepath/mpw"
+ln -sf "$sharepath/mpw" "$bindir/mpw"
+chmod +x "$sharepath/mpw"
+[[ ! -e "$bindir/bashlib" ]] && ln -s "$sharepath/bashlib" "$bindir/bashlib" ||:
+
+# Convenience bash function.
+inf "Installation successful!"
+echo
+inf "To improve usability, you can install an mpw function in your bash shell."
+inf "This function adds the following features:"
+inf "  - Ask the Master Password once, remember in the shell."
+inf "  - Automatically put the password in the clipboard (some platforms)."
+echo
+inf "To do this you need the following function in ~/.bashrc:\n%s" "$(<mpw.bashrc)"
+echo
+inf "We can do this for you automatically now."
+if ask -c Y!n "Append the mpw function to your .bashrc?"; then
+    cat mpw.bashrc >> ~/.bashrc
+    inf "Done!  Don't forget to run '%s' to apply the changes!" "source ~/.bashrc"
+fi
+echo
+inf "To begin using Master Password, type: mpw [site name]"

platform-independent/cli-java/src/main/scripts/mpw

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Uncomment this to set your user name.  Master Password will no longer ask you for a user name.
+# export MP_USERNAME="Robert Lee Mitchell"
+# Uncomment this to hardcode your master password.  Make sure this file's permissions are tight.  Master Password will not ask you for your master password anymore.  This is probably not a good idea.
+# export MP_PASSWORD="banana colored duckling"
+
+cd "%SHAREPATH%"
+exec java -jar masterpassword-cli-GIT-SNAPSHOT.jar "$@"

platform-independent/cli-java/src/main/scripts/mpw.bashrc

@@ -0,0 +1,15 @@
+source bashlib
+mpw() {
+    _nocopy() { echo >&2 "$(cat)"; }
+    _copy() { "$(type -P pbcopy || type -P xclip || echo _nocopy)"; }
+
+    # Empty the clipboard
+    :| _copy 2>/dev/null
+
+    # Ask for the user's name and password if not yet known.
+    MP_USERNAME=${MP_USERNAME:-$(ask -s 'Your Full Name:')}
+    MP_PASSWORD=${MP_PASSWORD:-$(ask -s 'Master Password:')}
+
+    # Start Master Password and copy the output.
+    printf %s "$(MP_USERNAME=$MP_USERNAME MP_PASSWORD=$MP_PASSWORD command mpw "$@")" | _copy
+}