X-Git-Url: https://git.cworth.org/git?p=notmuch-wiki;a=blobdiff_plain;f=remoteusage%2Faboriginal.mdwn;h=a558044f1771486a2bf03897223c64fbbe5656a2;hp=88ad036ae7af90b3df807353e4f1c0218349aca5;hb=6eecd927ff549dcc41c5240dd7868156db4bccc3;hpb=a0cd5d78701ce4b05e1cd5d0b9d92c0557f3b4db

diff --git a/remoteusage/aboriginal.mdwn b/remoteusage/aboriginal.mdwn
index 88ad036..a558044 100644
--- a/remoteusage/aboriginal.mdwn
+++ b/remoteusage/aboriginal.mdwn
@@ -15,42 +15,45 @@ from the script will fail.
 
 Write the following code to a file, for example `remote-notmuch.sh`.
 
-        #!/bin/bash
+	#!/bin/bash
 
-        # http://notmuchmail.org/remoteusage/aboriginal/
+	# http://notmuchmail.org/remoteusage/aboriginal/
 
-        set -eu
+	set -eu
+	# To trace execution, outcomment next line. Note that emacs input may ...
+	#exec 2>>remote-errors; echo -- >&2; set -x # ... change (no stderr).
 
-        readonly SSH_CONTROL_SOCK='~'/.ssh/master-user@host:22
+	readonly SSH_CONTROL_SOCK='~'/.ssh/master-user@host:22
 
-        readonly notmuch=notmuch
+	readonly notmuch=notmuch
 
-        printf -v ARGS '%q ' "$@" # bash feature
+	printf -v ARGS '%q ' "$@" # bash feature
 
-        readonly SSH_CONTROL_ARGS='-oControlMaster=no -S '$SSH_CONTROL_SOCK
+	readonly SSH_CONTROL_ARGS='-oControlMaster=no -S '$SSH_CONTROL_SOCK
 
-        if ssh $SSH_CONTROL_ARGS 0.1 $notmuch $ARGS 2>>/dev/null
-        then exit 0
-        else ev=$?
-        fi
+	if ssh -q $SSH_CONTROL_ARGS 0.1 $notmuch $ARGS
+	then exit 0
+	else ev=$?
+	fi
 
-        # continuing here in case ssh exited with nonzero value.
+	# continuing here in case ssh exited with nonzero value.
 
-        case $* in
-         'config get user.primary_email') echo 'nobody@nowhere.invalid'; exit 0 ;;
-         'config get user.name') echo 'nobody'; exit 0 ;;
-         'count'*) echo 1; exit 0 ;;
-         'search-tags'*) echo 'errors'; exit 0 ;;
-         'search'*'--output=tags'*) echo 'errors'; exit 0 ;;
-        esac
+	case $* in
+	 'config get user.primary_email') echo 'nobody@nowhere.invalid'; exit 0 ;;
+	 'config get user.name') echo 'nobody'; exit 0 ;;
+	 'count'*'--batch'*) while read line; do echo 1; done; exit 0 ;;
+	 'count'*) echo 1; exit 0 ;;
+	 'search-tags'*) echo 'errors'; exit 0 ;;
+	 'search'*'--output=tags'*) echo 'errors'; exit 0 ;;
+	esac
 
-        if ssh $SSH_CONTROL_ARGS -O check 0.1
-        then
-         echo ' Control socket is alive but something failed during data transmission.'
-         exit $ev
-        fi
+	if ssh $SSH_CONTROL_ARGS -O check 0.1
+	then
+	 echo ' Control socket is alive but something failed during data transmission.'
+	 exit $ev
+	fi
 
-        echo " See`sed '1d;2d;s/.//;q' "$0"` for help."
+	echo " See`sed '1d;2d;s/.//;q' "$0"` for help."
 
 Note the `0.1` in ssh command line. It is used to avoid any opportunistic
 behaviour ssh might do; for example if control socket is not alive ssh
@@ -99,12 +102,3 @@ to the `./remote-notmuch.sh` wrapper script testing with
 
 See the section *Configure Emacs on the client computer* in
 [[remoteusage|remoteusage]] how to do this. The instructions are the same.
-
-## Fun
-
-Original [BSD Licence](http://en.wikipedia.org/wiki/BSD_licenses)
-is 4-clause license.
-When 3 rd. clause was removed, the new license was not original anymore.
-Similarly, the requirement for this version are the same as in
-[[remoteusage|remoteusage]] page except the 3 rd. requirement
-(password-free login) is not effective here.