Test and fix log-notification.sh

templates/log-notification.sh.erb

@@ -13,15 +13,23 @@ else
 fi
 
 wrap_nl() {
-    echo $(echo "$1" | sed 's/\n/\n  /')
+    text="$1"
+    blank="$2"
+    if [ -z "$blank" ]; then
+        blank="  "
+    fi
+    echo "$(echo "$text" | sed "2~1s/^/$blank/g")"
 }
 
 output=$(wrap_nl "$OUTPUT")
 
 if [ -n "$NOTIFICATIONAUTHORNAME" ]; then
-    output="$output\n Author: $NOTIFICATIONAUTHORNAME\n  "$(wrap_nl "$NOTIFICATIONCOMMENT")
+    output+=`echo -e "\n Author: "`
+    output+="$NOTIFICATIONAUTHORNAME"
+    output+=`echo -e "\n Comment: "`
+    output+=$(wrap_nl "$NOTIFICATIONCOMMENT")
 fi
 
-printf "[%s] [%s] [%s] [%s] [%s] %s" \
+printf "[%s] [%s] [%s] [%s] [%s] %s\n" \
     "$DATE" "$USERNAME" "$OBJECT_NAME" "$NOTIFICATIONTYPE" "$STATE" "$output" \
     >> "$LOGFILE"