Merge pull request #76 from coursehero/remove-carriage-return

Remove carriage returns to avoid sending error
coursehero · Apr 12, 2021 · 3e8edf9 · 3e8edf9
2 parents dd1d4e7 + 4335249
commit 3e8edf9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/slacktee.sh b/slacktee.sh
@@ -140,6 +140,9 @@ function send_message()
 {
 	message="$1"
 
+	# Remove carriage returns
+	message=`echo $message | tr -d '\r'`
+
 	# Its a blank message, ignore
 	if [[ $message == "-- $title --\n" ]]; then
 	    return

diff --git a/test/test.sh b/test/test.sh
@@ -2,8 +2,9 @@
 # - Test set of slacktee.sh -
 
 # Test settings
-SLACKTEE="/bin/bash ../slacktee.sh"
-DATA="./test_data.txt"
+TEST_DIR=`dirname ${BASH_SOURCE[0]}`
+SLACKTEE="/bin/bash ${TEST_DIR}/../slacktee.sh"
+DATA="${TEST_DIR}/test_data.txt"
 CHANNEL="sandbox"
 SUB_CHANNEL="sandbox2"
 
@@ -217,4 +218,7 @@ echo $long_message | $SLACKTEE -p # should be split up over two messages
 # echo $long_message | $SLACKTEE --streaming
 # echo $long_message | $SLACKTEE
 
+# Test 27: Carriage return should be removed
+echo -e "\rcarriage \rreturn\r" | $SLACKTEE
+
 echo "Test is done!"