Reorganization to hopefully prevent git conflicts.

modules/sing/sing.sh

@@ -13,15 +13,15 @@ if ! check_dependencies "${dependencies[@]}"; then
     msg "$chan" "$1: This module requires: ${dependencies[*]}"
     exit 1
 fi
-#get the lyric text into a variable
-lyricText="$(clyrics $@ | tr '[:space:]' ' ' | tr -s ' ' | fold -s -w 384)"
+# Get the lyric text into a variable (quote $@ to prevent command injection)
+lyricText="$(clyrics "$@" | tr '[:space:]' ' ' | tr -s ' ' | fold -s -w 384)"
 i=$(echo "$lyricText" | wc -l)
-i=$(($RANDOM % $i + 1))
+i=$((RANDOM % i + 1))
 lyricText="$(echo "$lyricText" | tail +$i | head -1 | rev | cut -d '.' -f2- | rev)"
 #Display the lyric text
 if [ ${#lyricText} -gt 15 ] ; then
 msg "$chan" "${lyricText}"
 exit 0
 fi
-msg "$chan" "no lyrics found for $@."
+msg "$chan" "no lyrics found for $*."
 exit 0