Enhance log messages

lib/core_lib.sh

@@ -189,7 +189,7 @@ print_log_message () {
 		echo "FATAL: $FUNCNAME requires env var LOG_FILE" >&2
 		exit 2
 	fi
-	if [ ! -f "$LOG_FILE" ]; then
+	if [ ! -f "$LOG_FILE" ] && [[ $LOG_FILE != /dev/* ]]; then
 		echo "FATAL: $FUNCNAME: file does not exist: $LOG_FILE" >&2
 		exit 2
 	fi
@@ -292,39 +292,36 @@ clean_up_and_exit () {
 				unwanted_dir="$OPTARG"
 				;;
 			\?)
-				echo "ERROR: $FUNCNAME: Unrecognized option: -$OPTARG" >&2
-				return 2
+				print_log_message -E "$FUNCNAME: Unrecognized option: -$OPTARG"
 				;;
 			:)
-				echo "ERROR: $FUNCNAME: Option -$OPTARG requires an argument" >&2
-				return 2
+				print_log_message -E "$FUNCNAME: Option -$OPTARG requires an argument"
 				;;
 		esac
 	done
 
 	# determine the exit code
 	shift $(( OPTIND - 1 ))
 	if [ $# -ne 1 ]; then
-		echo "ERROR: $FUNCNAME: wrong number of arguments: $# (1 required)" >&2
-		return 2
+		print_log_message -F "$FUNCNAME: wrong number of arguments: $# (1 required)"
+		exit 2
 	fi
 	exit_code="$1"
 	if [ ! "$exit_code" -ge 0 ] ; then
-		echo "ERROR: $FUNCNAME: illegal exit code: $exit_code" >&2
-		return 2
+		print_log_message -F "$FUNCNAME: illegal exit code: $exit_code"
+		exit 2
 	fi
 
 	if [ -n "$unwanted_dir" ]; then
 		if [ ! -d "$unwanted_dir" ]; then
-			echo "ERROR: $FUNCNAME: directory does not exist: $unwanted_dir" >&2
-			return 2
-		fi
-
-		# remove the unwanted directory (!)
-		print_log_message -D "$FUNCNAME removing dir: $unwanted_dir"
-		/bin/rm -rf "$unwanted_dir"
-		if [ $? -ne 0 ]; then
-			echo "ERROR: $FUNCNAME failed to remove dir: $unwanted_dir" >&2
+			print_log_message -E "$FUNCNAME: directory does not exist: $unwanted_dir"
+		else
+			# remove the unwanted directory (!)
+			print_log_message -D "$FUNCNAME removing dir: $unwanted_dir"
+			/bin/rm -rf "$unwanted_dir"
+			if [ $? -ne 0 ]; then
+				print_log_message -E "$FUNCNAME failed to remove dir: $unwanted_dir"
+			fi
 		fi
 	fi