Merge branch 'main' into testing

Fix typo
2023-11-22 12:13:09 +01:00 · 2023-11-22 12:12:57 +01:00
1 changed files with 2 additions and 3 deletions
--- a/templates/script/delete_announcement_with_subject.erb.sh
+++ b/templates/script/delete_announcement_with_subject.erb.sh
@ -1,6 +1,6 @@
 #!/bin/bash

-VALID_ARGS=$(getopt -o s --long subject -- "$@")
+VALID_ARGS=$(getopt -o s: --long subject: -- "$@")
 # shellcheck disable=SC2181
 if [[ ${?} -ne 0 ]]; then
    exit 1;
@ -28,9 +28,8 @@ done
 if [[ -z ${subject} ]]; then
  usage
 fi
-fi

-id=$(/root/tasks/announce.sh --get | xmlstarlet sel -t  -i '//subject="'${subject}'"' -m "/ocs/data/element/id" -v .)
+id=$(/root/tasks/announce.sh --get | xmlstarlet sel -t  -i '//subject="'"${subject}"'"' -m "/ocs/data/element/id" -v .)
 if [[ -n ${id} ]]; then
  /root/tasks/announce.sh --delete --id "${id}"
 fi
Author	SHA1	Message	Date
Micke Nordin	c425f90b0f	Merge branch 'main' into testing	2023-11-22 12:13:09 +01:00
Micke Nordin	7dc9667bec	Fix typo	2023-11-22 12:12:57 +01:00