Rename object-related variables.

1 files changed, 13 insertions, 13 deletions

diff --git a/localkannel-dispatch b/localkannel-dispatch
index 41f6e64..54a13da 100755
--- a/localkannel-dispatch
+++ b/localkannel-dispatch
@@ -113,18 +113,18 @@ return1()	{
 vardir="/var/lib/kannel/hello"
 findobjects() {
 	set -e
-	object="$1"; shift || return1 "Internal error in routine \"findobjects\" (empty object)!"
+	type="$1"; shift || return1 "Internal error in routine \"findobjects\" (empty object)!"
 	limit="$@"
 	regex="$(echo  "$limit" | perl -ne '/^\/(.+)\/$/ and print $1')"
 	args="$(echo  "$limit" | perl -ne 's/.*?([a-z0-9]+).*?/ $1/g and print')"
-	[ -d "$vardir/$object" ] || return
+	[ -d "$vardir/$type" ] || return
 	if [ -z "$*" ]; then
-		cd "$vardir/$object" && find -mindepth 1 -maxdepth 1 -type d -printf '%f\n'
+		cd "$vardir/$type" && find -mindepth 1 -maxdepth 1 -type d -printf '%f\n'
 	elif [ -n "$regex" ]; then
-		cd "$vardir/$object" && find -mindepth 1 -maxdepth 1 -type d -regex "$regex"
+		cd "$vardir/$type" && find -mindepth 1 -maxdepth 1 -type d -regex "$regex"
 	elif [ -n $args ]; then
 		args_multiline="$(echo "$args" | perl -pe 's/[[:space:]]+/\n/g')"
-		cd "$vardir/$object" && ! find -mindepth 1 -maxdepth 1 -type d -printf '%f\n' \
+		cd "$vardir/$type" && ! find -mindepth 1 -maxdepth 1 -type d -printf '%f\n' \
 			| grep -Fx "$args_multiline" || true
 	else
 		return1 "Internal error in routine \"findobjects\" (illegal limit)!"
@@ -132,13 +132,13 @@ findobjects() {
 }
 addobject() {
 	set -e
-	object="$1"
+	type="$1"
 	name="$2"
-	oldname="$(findobjects "$object" "$name")" || return1 "$oldname"
-	[ -z "$oldname" ] || return1 "$object \"$name\" already exist."
+	oldname="$(findobjects "$type" "$name")" || return1 "$oldname"
+	[ -z "$oldname" ] || return1 "$type \"$name\" already exist."
 	[ -n "$name" ] || return1 "Internal error in routine \"addobject\" (empty name)!"
-	mkdir -p "$vardir/$object/$name"
-	chgrp --reference="$vardir" "$vardir/$object/$name"
+	mkdir -p "$vardir/$type/$name"
+	chgrp --reference="$vardir" "$vardir/$type/$name"
 	echo "$name"
 }
 
@@ -163,9 +163,9 @@ case "$app" in
 	  add|create)
 		case "$1" in
 		  user|group)
-			object="$1"; shift || exit1 "Internal error while adding object."
-			name="$(addobject "$object" "$@")" || exit1 "Failed adding $object${name+: $name}!"
-			/usr/local/sbin/localsendsms "$to" "$object \"$name\" added."
+			objecttype="$1"; shift || exit1 "Internal error while adding object."
+			objectname="$(addobject "$objecttype" "$@")" || exit1 "Failed adding $objecttype${objectname+: $objectname}!"
+			/usr/local/sbin/localsendsms "$to" "$objecttype \"$objectname\" added."
 			;;
 		  *)
 			exit1 "Cannot add \"$1\" (try \"add user\" or \"add group\" instead)."