Merge from head

share/examples/csh/dot.cshrc

@@ -9,11 +9,11 @@
 # has multiple ssh-agent(1) processes running, this will very likely
 # set SSH_AUTH_SOCK to point to the wrong file/domain socket.
 if (${?SSH_AUTH_SOCK} != "1") then
-	setenv SSH_AUTH_SOCK `sockstat -u | awk '/^${USER}.+ ssh-agent/ { print $6 }'
+	setenv SSH_AUTH_SOCK `sockstat -u | awk '/^${USER}.+ ssh-agent/ { print $6 }'`
 endif
 
 # Change only root's prompt
-if (`id -g` == 0)
+if (`id -g` == 0) then
 	set prompt="root@%m# "
 endif
 
@@ -70,7 +70,7 @@ complete grep		'c/-*A/x:<#_lines_after>/' \
       		'n/-*f/f/' \
       		'n/*/f/'
 complete ifconfig	'p@1@`ifconfig -l`@' \
-      		'n/*/(range phase link netmask mtu vlandev vlan metric mediaopt down delete broadcast arp debug)/'
+      		'n/*/(range phase link netmask mtu vlandev vlan metric mediaopt down delete broadcast arp debug)/' \
       		'c/%/j/' \
       		'n/*/`ps -ax | awk '"'"'{print $1}'"'"'`/'
 complete kill		'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $1}'"'"'`/'

share/examples/tests/tests/plain/cp_test.sh

@@ -1,3 +1,4 @@
+#! /bin/sh
 # $FreeBSD$
 #
 # Copyright 2013 Google Inc.