Change head -1 -> head -n 1

8 files changed, 22 insertions, 22 deletions

diff --git a/aptdpkgro b/aptdpkgro
index b574c88..0fcd77e 100755
--- a/aptdpkgro
+++ b/aptdpkgro
@@ -2,9 +2,9 @@
 #
 # /usr/local/sbin/aptdpkgro
 # Put together and tweaked by Jonas Smedegaard <dr@jones.dk>
-# 2001-2002
+# 2001-2006
 #
-# $Id: aptdpkgro,v 1.1 2002-03-07 16:22:51 jonas Exp $
+# $Id: aptdpkgro,v 1.2 2006-07-16 12:33:59 jonas Exp $
 #
 # Auto re-mounting of a readonly /usr
 # Put the following in a file below /etc/apt/apt.conf.d:
@@ -29,7 +29,7 @@
 pathmatch="^/usr"
 
 while read debname; do
-	pkg=$(dpkg --info $debname | sed -n 's/^ Package: *//p' | head -1)
+	pkg=$(dpkg --info $debname | sed -n 's/^ Package: *//p' | head -n 1)
 	(dpkg -L "$pkg" 2>/dev/null || true) | grep "$pathmatch" |
 	  while read file; do
 		[ -f "$file" -a ! -L "$file" ] || continue
diff --git a/deluser.local b/deluser.local
index 9f5ac3c..713c7f3 100755
--- a/deluser.local
+++ b/deluser.local
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
 # /usr/local/sbin/deluser.local
-# Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
+# Copyright 2001-2006 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: deluser.local,v 1.20 2006-01-12 23:38:45 jonas Exp $
+# $Id: deluser.local,v 1.21 2006-07-16 12:34:00 jonas Exp $
 #
 # Common deluser additions for Spiff and Xenux networks
 #
@@ -25,7 +25,7 @@ delfromlist()	{ /bin/echo "$1" | /usr/sbin/remove_members -f - "$2"; }
 
 #. /etc/deluser.conf
 # Workaround: default deluser.conf is not sh-compatible (like adduser.conf)
-REMOVE_HOME=`grep REMOVE_HOME /etc/deluser.conf | awk -F= '{print $2}' | head -1 | sed 's/^ //g'`
+REMOVE_HOME=`grep REMOVE_HOME /etc/deluser.conf | awk -F= '{print $2}' | head -n 1 | sed 's/^ //g'`
 
 # Ignore non-human accounts silently
 [ "$OLDUID" -ge "$FIRST_UID" -a "$OLDUID" -le "$LAST_UID" ] || exit 0
diff --git a/ipsec-updown-ipmasq b/ipsec-updown-ipmasq
index 8b61d86..53093a8 100755
--- a/ipsec-updown-ipmasq
+++ b/ipsec-updown-ipmasq
@@ -28,7 +28,7 @@
 #   to change the reference of a 10.0.x.x network below to the IP range
 #   you're using!
 #
-# RCSID $Id: ipsec-updown-ipmasq,v 1.2 2002-10-22 13:59:14 jrisch Exp $
+# RCSID $Id: ipsec-updown-ipmasq,v 1.3 2006-07-16 12:34:00 jonas Exp $
 
 
 # CAUTION:  Installing a new version of FreeS/WAN will install a new
@@ -89,7 +89,7 @@ doroute() {
 		;;
 	esac
 	st=$?
-	src="`ifconfig | egrep "^[[:space:]]*inet addr:10\.0\." | cut -f2 -d: | cut -f1 -d' ' | head -1`"
+	src="`ifconfig | egrep "^[[:space:]]*inet addr:10\.0\." | cut -f2 -d: | cut -f1 -d' ' | head -n 1`"
 	if test "$src" ; then
 		ip ro ls | egrep "^10\.0\..* dev ipsec" | egrep -v " src " |
 			while read ; do
diff --git a/localaddmysqldb b/localaddmysqldb
index ea4fa5c..2e8c780 100755
--- a/localaddmysqldb
+++ b/localaddmysqldb
@@ -1,9 +1,9 @@
 #!/bin/bash
 #
 # /usr/local/sbin/localaddmysqldb
-# Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
+# Copyright 2001-2006 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localaddmysqldb,v 1.10 2004-03-20 16:38:34 jonas Exp $
+# $Id: localaddmysqldb,v 1.11 2006-07-16 12:34:00 jonas Exp $
 #
 # Add/update MySQL database
 #
@@ -150,7 +150,7 @@ if [ -n "$verbose" ]; then
 fi
 if [ -z "$dbpass" ]; then
 	if [ -f $home/.my.cnf ]; then
-		dbpass=$(grep password $home/.my.cnf | awk -F= '{print $2}' | head -1 | sed 's/^ //g')
+		dbpass=$(grep password $home/.my.cnf | awk -F= '{print $2}' | head -n 1 | sed 's/^ //g')
 	fi
 	if [ -z "$dbpass" ]; then
 		if [ -n "$query" ]; then
diff --git a/localdumpsql b/localdumpsql
index a6dabe4..45182af 100755
--- a/localdumpsql
+++ b/localdumpsql
@@ -1,9 +1,9 @@
 #!/bin/bash
 #
 # /usr/local/sbin/localdumpsql
-# Copyright 2001-2003 Jonas Smedegaard <dr@jones.dk>
+# Copyright 2001-2006 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localdumpsql,v 1.15 2005-12-11 21:05:09 jonas Exp $
+# $Id: localdumpsql,v 1.16 2006-07-16 12:34:00 jonas Exp $
 #
 # MySQL/PostgreSQL maintenance script
 #
@@ -57,7 +57,7 @@ function gethome_user()		{ getent passwd "$1" | awk -F: '{print $6}' | head -n 1
 function getbackupdir_user()	{ echo "`gethome_user \"$1\"`/backup"; }
 
 function mysqlvalid()		{ [ -x $mysql_bin ]; }
-#function mysqlpasswd_user()	{ grep password "`gethome_user $1`"/.my.cnf | awk -F= '{print $2}' | awk '{print $1}' | head -1; }
+#function mysqlpasswd_user()	{ grep password "`gethome_user $1`"/.my.cnf | awk -F= '{print $2}' | awk '{print $1}' | head -n 1; }
 function mysql_users()		{ if [ -n "$1" ]; then echo "$1"; else mysql -uroot mysql -e "select User from user;" | grep -Ev '^(User|debian-sys-maint|root|.+-admin)$' | sort -u; fi; }
 function mysql_db_user()	{ if [ -n "$1" ]; then echo "$1"; else mysql -u root mysql -re "select Db from db where User='$2';" | grep -v '^Db$' | sort -u; fi; }
 #function mysqldump_user_db()	{ $mysql_bin --opt --user="$1" --password="`mysqlpasswd_user $1`" "$2"; }
diff --git a/localezcreate b/localezcreate
index cdccee1..bd7a1d3 100755
--- a/localezcreate
+++ b/localezcreate
@@ -1,9 +1,9 @@
 #!/bin/bash
 #
 # /usr/local/sbin/localezcreate
-# Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
+# Copyright 2001-2006 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localezcreate,v 1.29 2003-08-14 18:52:27 jonas Exp $
+# $Id: localezcreate,v 1.30 2006-07-16 12:34:00 jonas Exp $
 #
 # Create local eZ Publish site
 #
@@ -176,7 +176,7 @@ if [ -n "$verbose" ]; then
 fi
 if [ -z "$dbpass" ]; then
 	if [ -f $home/.my.cnf ]; then
-		dbpass=$(grep password $home/.my.cnf | awk -F= '{print $2}' | head -1 | sed 's/^ //g')
+		dbpass=$(grep password $home/.my.cnf | awk -F= '{print $2}' | head -n 1 | sed 's/^ //g')
 	fi
 	if [ -z "$dbpass" ]; then
 		if [ -n "$query" ]; then
diff --git a/localgotallmail b/localgotallmail
index a52bc03..6bce78c 100755
--- a/localgotallmail
+++ b/localgotallmail
@@ -22,8 +22,8 @@ if [ "$VERBOSE" ]; then
 fi
 
 for user in $USERS; do
-	uid=`getent passwd $user | awk -F: '{print $3}' | head -1`
-	HOME=`getent passwd $user | awk -F: '{print $6}' | head -1`
+	uid=`getent passwd $user | awk -F: '{print $3}' | head -n 1`
+	HOME=`getent passwd $user | awk -F: '{print $6}' | head -n 1`
 	if [ -z "$HOME" ]; then
 		echo "User $user doesn't exist. Ignoring..."
 		continue
diff --git a/user-init b/user-init
index fb2def6..5add1f8 100755
--- a/user-init
+++ b/user-init
@@ -84,8 +84,8 @@ fi
 
 echo "Setting up additional folders and permissions..."
 for user in $USERS; do
-	uid="`getent passwd \"$user\" | awk -F: '{print $3}' | head -1`"
-	HOME="`getent passwd \"$user\" | awk -F: '{print $6}' | head -1`"
+	uid="`getent passwd \"$user\" | awk -F: '{print $3}' | head -n 1`"
+	HOME="`getent passwd \"$user\" | awk -F: '{print $6}' | head -n 1`"
 	if [ -z "$HOME" ]; then
 		echo "User $user doesn't exist. Ignoring..."
 		continue
@@ -132,7 +132,7 @@ for user in $USERS; do
 #	su -s /bin/bash -c localuserconfig "$user"
 
 	if [ "$do_server" = "yes" ] && [ -r "$server_conf" ] && [ -f "$HOME/$server_userconf" ]; then
-		server_username="$(grep '^username' \"$HOME/$server_userconf\" | awk -F= '{print $2}' | head -1 | awk '{print $1}')"
+		server_username="$(grep '^username' \"$HOME/$server_userconf\" | awk -F= '{print $2}' | head -n 1 | awk '{print $1}')"
 		if [ -n "$server_username" ]; then
 			if grep -q "^volume $user " "$server_conf"; then
 				perl -pi -e "s|^volume $user .*|volume $user smb $server_name $server_username $HOME/$server_root uid=$user,gid=$user - -|" "$server_conf"