Release 2.18.1

Author: TheCaptain989

README.md

@@ -281,7 +281,7 @@ Modifiers may be combined, such as `:any+fd` to keep all forced and all default
 Use the `--set-default` options to choose tracks that appear first when the video is played. Only one audio and one subtitles track may be set as default. The language code is the same colon (`:`) prepended ISO 639-2 language code used with the `--audio` and `--subs` options.
 The first track of the specified language will have its default flag set and all other tracks (of any language) will have their default flag disabled.
 
-The language code can optionally be follow by an equals (`=`) and a string which is used to match against the track name. The first track that matches the specified language and with a name that matches the string will be set to default.
+The language code can optionally be followed by an equals (`=`) and a string which is used to match against the track name. The first track that matches the specified language and with a name that matches the string will be set to default.
 The string matching uses a substring and is case insensitive. You can use this to set the default subtitles track to hearing impared (SDH), or the audio track to your preferred language.
 
 The setting of default track flags occurs after the track selection logic.

root/usr/local/bin/striptracks.sh

@@ -646,14 +646,15 @@ function get_mediainfo {
 
   local videofile="$1"  # Video file to inspect
 
-  local mkvcommand="/usr/bin/mkvmerge -J \"$videofile\""
+  local mkvcommand="/usr/bin/mkvmerge -J \"$(escape_string "$videofile")\""
   execute_mkv_command "$mkvcommand" "inspecting video"
+  local return=$?
 
   unset striptracks_json
   # This must be a declare statement to avoid the 'Argument list too long' error with some large returned JSON (see issue #104)
   declare -g striptracks_json
   striptracks_json="$striptracks_mkvresult"
-  return
+  return $return
 }
 # function import_video {
   # # Import new video into Radarr/Sonarr
@@ -1047,14 +1048,24 @@ function wait_if_locked {
   fi
   return $return
 }
+function escape_string {
+  # Escape special characters in string for use in mkvmerge/mkvpropedit commands
+
+  local input="$1" # Input string to escape
+
+  # Escape backslashes, double quotes, and dollar signs
+  # shellcheck disable=SC2001
+  local output="$(echo "$input" | sed -e 's/[`"\\$]/\\&/g')"
+  echo "$output"
+}
 function execute_mkv_command {
   # Execute mkvmerge or mkvpropedit command
 
   local command="$1" # Full mkvmerge or mkvpropedit command to execute
   local action="$2" # Action being performed (for logging purposes)
 
   [ $striptracks_debug -ge 1 ] && echo "Debug|Executing: $command" | log
-  local shortcommand="$(echo $command | sed -E 's/(nice )?([^ ]+).*$/\2/')"
+  local shortcommand="$(echo $command | sed -E 's/(.+ )?(\/[^ ]+) .*$/\2/')"
   shortcommand=$(basename "$shortcommand")
   unset striptracks_mkvresult
   # This must be a declare statement to avoid the 'Argument list too long' error with some large returned JSON (see issue #104)
@@ -1620,7 +1631,7 @@ function set_default_tracks {
 
   if [ -n "$striptracks_default_flags" ]; then
     # Execute mkvpropedit to set default flags on tracks
-    local mkvcommand="/usr/bin/mkvpropedit -q $striptracks_default_flags \"$striptracks_video\""
+    local mkvcommand="/usr/bin/mkvpropedit -q $striptracks_default_flags \"$(escape_string "$striptracks_video")\""
     execute_mkv_command "$mkvcommand" "setting default track flags"
   fi
 }
@@ -1637,7 +1648,7 @@ function set_title_and_exit_if_nothing_removed {
         # Remuxing not performed
         local message="Info|No tracks would be removed from video$( [ "$striptracks_reorder" = "true" ] && echo " or reordered"). Setting Title only and exiting."
         echo "$message" | log
-        local mkvcommand="/usr/bin/mkvpropedit -q --edit info --set \"title=$striptracks_title\" \"$striptracks_video\""
+        local mkvcommand="/usr/bin/mkvpropedit -q --edit info --set \"title=$(escape_string "$striptracks_title")\" \"$(escape_string "$striptracks_video")\""
         execute_mkv_command "$mkvcommand" "setting video title"
         end_script
       else
@@ -1672,7 +1683,7 @@ function remux_video {
   fi
 
   # Execute MKVmerge (remux then rename, see issue #46)
-  local mkvcommand="$striptracks_nice /usr/bin/mkvmerge --title \"$striptracks_title\" -q -o \"$striptracks_tempvideo\" $audioarg $subsarg $striptracks_neworder \"$striptracks_video\""
+  local mkvcommand="$striptracks_nice /usr/bin/mkvmerge --title \"$(escape_string "$striptracks_title")\" -q -o \"$(escape_string "$striptracks_tempvideo")\" $audioarg $subsarg $striptracks_neworder \"$(escape_string "$striptracks_video")\""
   execute_mkv_command "$mkvcommand" "remuxing video"
 
   # Check for non-empty file