Merge lp:~wlxing/ecryptfs/lp1449253 into lp:ecryptfs

[Jason Xing]

* Fix "ecryptfs-mount-private -h requests password instead of printing short usage message". if user add parameters to ecryptfs-mount-private, it will print the usage information.
* Also, update the manpage for ecryptfs-mount-private

[Tyler Hicks (tyhicks)]

Thanks for the patch!

Just a few nitpicks:

1) Please remove the initial newline in the echo command

2) There shouldn't be a newline after "usage:"

3) The test for $1 being not zero length isn't technically correct. Try this
   command to see why:

   $ ecryptfs-mount-private "" -h

   I think this is the test that you want:

   if [ "$#" -ne 0 ]; then
   ...

Thanks!

review: Needs Fixing

[lp:~wlxing/ecryptfs/lp1449253]

889. By Jason Xing on 2017-06-08

src/utils/ecryptfs-mount-private, doc/manpage/ecryptfs-mount-private.1: ecryptfs-mount-private -h prints short usage message (LP: #1449253)

[Jason Xing (wlxing)]

Thanks for your instructions!!!

I tested it as you said. It requests the passphrase not prompts user usage information. But your code is what I want! Thanks again!

review: Needs Resubmitting

[Tyler Hicks (tyhicks)]

Looks good to me!

review: Approve

=== modified file 'doc/manpage/ecryptfs-mount-private.1'
--- doc/manpage/ecryptfs-mount-private.1	2013-01-24 22:34:19 +0000
+++ doc/manpage/ecryptfs-mount-private.1	2017-06-08 15:12:34 +0000
@@ -3,11 +3,13 @@
 ecryptfs-mount-private \- interactive eCryptfs private mount wrapper script.
 
 .SH SYNOPSIS
-\fBecryptfs-mount-private\fP
+\fBecryptfs-mount-private\fP [\-h|\-\-help]
 
 .SH DESCRIPTION
 \fBecryptfs-mount-private\fP is a wrapper script for the \fBmount.ecryptfs_private\fP utility that will interactively prompt for the user's login password, if necessary.
 
+The only valid options are \-h or \-\-help. If specified, the usage information will be printed.
+
 .SH FILES
 \fI~/.Private\fP - underlying directory containing encrypted data
 
 
=== modified file 'src/utils/ecryptfs-mount-private'
--- src/utils/ecryptfs-mount-private	2011-12-13 20:51:40 +0000
+++ src/utils/ecryptfs-mount-private	2017-06-08 15:12:34 +0000
@@ -18,6 +18,19 @@
 TEXTDOMAIN="ecryptfs-utils"
 MESSAGE=`gettext "Enter your login passphrase:"`
 
+usage() {
+echo "usage: ecryptfs-mount-private [OPTION]
+Interactive eCryptfs private mount wrapper.
+
+  -h, --help    Show usage information
+"
+	exit 1;
+}
+
+if [ "$#" -ne 0 ]; then
+	usage
+fi
+
 if [ -f $HOME/.ecryptfs/wrapping-independent ]; then
 	# use a wrapping passphrase different from the login passphrase
 	WRAPPING_PASS="INDEPENDENT"