Fixes multiple issues with tool

Change-Id: Ib465caa9029edc737df2c419d2ef763ec24165e1


[ROCm/rocprofiler commit: 48374bf453]

projects/rocprofiler/bin/rocprofv2

@@ -51,7 +51,7 @@ usage() {
   echo -e "\t#${GREY} 1 - Legacy output format, 2 - New output format (default)${RESET}\n"
   echo -e "${GREEN}-i   | --input ${RESET}               For adding counters file path (every line in the text file represents a counter)"
   echo -e "\t#${GREY} usage: rocprofv2 -i pmc.txt -d <executable>${RESET}\n"
-  echo -e "${GREEN}-o   | --output-file ${RESET}         For the output file name"
+  echo -e "${GREEN}-o   | --output-file-name ${RESET}         For the output file name"
   echo -e "\t#${GREY} usage e.g:(with current dir): rocprofv2 --hip-trace -o <file_name> <executable>"
   echo -e "\t#${GREY} usage e.g:(with custom dir):  rocprofv2 --hip-trace -d <out_dir> -o <file_name> <executable>${RESET}\n"
   echo -e "${GREEN}-d   | --output-directory ${RESET}    For adding output path where the output files will be saved"
@@ -276,7 +276,7 @@ fi
 
 if [ -z $ROCPROFILER_PLUGIN_LIB ]; then
   PLUGIN_TO_BE_USED=file_plugin
-  if [ -z $OUTPUT_PATH ]; then
+  if [[ -z $OUTPUT_PATH && -z $OUT_FILE_NAME ]]; then
     PLUGIN_TO_BE_USED=cli_plugin
   fi
   if [ -f $ROCM_DIR/lib/rocprofiler/$ROCPROFILER_PLUGIN_LIB$ROCPROFILER_PLUGIN_LIB_VERSION ]; then