CLI tool install script.

[UPDATED]   Templates are now in ciphers.plist.
[ADDED]     Install script for Java-based mpw CLI tool.
[UPDATED]   Java tool is now bundled in a single executable self-containing JAR.

MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplates.java

@@ -32,10 +32,16 @@ public class MPTemplates extends MetaObject {
         this.templates = templates;
     }
 
+    public static MPTemplates load() {
+
+        return loadFromPList( "ciphers.plist" );
+    }
+
     public static MPTemplates loadFromPList(final String templateResource) {
 
         @SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
         InputStream templateStream = Thread.currentThread().getContextClassLoader().getResourceAsStream( templateResource );
+        Preconditions.checkNotNull( templateStream, "Not found: %s", templateResource );
         try {
             NSObject plistObject = PropertyListParser.parse( templateStream );
             Preconditions.checkState( NSDictionary.class.isAssignableFrom( plistObject.getClass() ) );
@@ -98,6 +104,6 @@ public class MPTemplates extends MetaObject {
 
     public static void main(final String... arguments) {
 
-        loadFromPList( "templates.plist" );
+        load();
     }
 }

MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MasterPassword.java

@@ -31,7 +31,7 @@ public abstract class MasterPassword {
     private static final ByteOrder                    MP_byteOrder = ByteOrder.BIG_ENDIAN;
     private static final MessageDigests               MP_hash      = MessageDigests.SHA256;
     private static final MessageAuthenticationDigests MP_mac       = MessageAuthenticationDigests.HmacSHA256;
-    private static final MPTemplates                  templates    = MPTemplates.loadFromPList( "templates.plist" );
+    private static final MPTemplates                  templates    = MPTemplates.load();
 
     public static byte[] keyForPassword(final String password, final String username) {
 

MasterPassword/Java/masterpassword-cli/pom.xml

@@ -29,30 +29,49 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
+                <artifactId>maven-antrun-plugin</artifactId>
-                <configuration>
+                <version>1.7</version>
-                    <archive>
+                <executions>
-                        <manifest>
+                    <execution>
-                            <mainClass>com.lyndir.lhunath.masterpassword.CLI</mainClass>
+                        <id>prepare-package</id>
-                            <addClasspath>true</addClasspath>
+                        <phase>prepare-package</phase>
-                            <classpathPrefix>lib/</classpathPrefix>
+                        <configuration>
-                        </manifest>
+                            <target>
-                    </archive>
+                                <chmod file="${project.build.directory}/install" perm="755"/>
-                </configuration>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
+                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.2</version>
                 <executions>
                     <execution>
-                        <id>copy-dependencies</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>copy-dependencies</goal>
+                            <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>com.lyndir.lhunath.masterpassword.CLI</mainClass>
+                                </transformer>
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                         </configuration>
                     </execution>
                 </executions>

MasterPassword/Java/masterpassword-cli/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]"

MasterPassword/Java/masterpassword-cli/src/main/scripts/mpw

@@ -5,5 +5,5 @@
 # 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 "${BASH_SOURCE[0]%/*}"
+cd "%SHAREPATH%"
-java -jar masterpassword-cli-GIT-SNAPSHOT.jar "$@"
+exec java -jar masterpassword-cli-GIT-SNAPSHOT.jar "$@"

MasterPassword/Java/masterpassword-cli/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
+}

MasterPassword/Java/pom.xml

@@ -21,7 +21,7 @@
     <modules>
         <module>masterpassword-algorithm</module>
         <module>masterpassword-cli</module>
-        <module>masterpassword-android</module>
+        <!--module>masterpassword-android</module-->
     </modules>
 
     <!-- REMOTE ARTIFACT REPOSITORIES -->