diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-09-25 15:22:37 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-09-25 15:22:37 +0200 |
| commit | 0e2c7628ec070e635c8d4d449a91000f70033bda (patch) | |
| tree | 679ec670dcd6ff5dce9b08d13a2b1c14f49f0c8a | |
| parent | 2e84c80b228b77335ce44fe0f7ff1edf022d2246 (diff) | |
Fix bash shell expansion in some error messages.
| -rwxr-xr-x | localsmsadmin | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/localsmsadmin b/localsmsadmin index 8e1e6da..5c249ff 100755 --- a/localsmsadmin +++ b/localsmsadmin @@ -301,9 +301,9 @@ EOF type="$1"; shift name="$1"; [ -n "$name" ] || exit1 "Internal error (empty name)!"; shift [ -z "$*" ] || exit1 "Internal error (too many options)!" - oldname="$(findobjects "$type" "$name")" || exit1 "Internal error${oldname+: $oldname}" + oldname="$(findobjects "$type" "$name")" || exit1 "Internal error${oldname:+ $oldname}" [ -n "$oldname" ] || exit1 "No $type named \"$name\"!" - items="$(finditems "$type" "$name")" || exit1 "Internal error${items+: $items}" + items="$(finditems "$type" "$name")" || exit1 "Internal error${items:+ $items}" # TODO: find user by phone number for item in $items; do rm "$vardir/$type/$name/$item" || exit1 "Internal error during $type $name item removal!" @@ -321,7 +321,7 @@ EOF # case "$1" in # default|user|group|session) # type="$1"; shift -# response="$(listobject "$type" "$@")" || exit1 "Failed listing $type${response+: $response}" +# response="$(listobject "$type" "$@")" || exit1 "Failed listing $type${response:+ $response}" # exit0 "Listing $type: $response." # ;; # *) |