Merge branch 'irfanview-bump' into 'master'

fix irfanview invocation

Closes #21

See merge request bgstack15/stackrpms!163

1 files changed, 8 insertions, 6 deletions

diff --git a/irfanview/debian/bin/irfanview-common b/irfanview/debian/bin/irfanview-common
index 6c178fc..9c32c98 100755
--- a/irfanview/debian/bin/irfanview-common
+++ b/irfanview/debian/bin/irfanview-common
@@ -11,6 +11,7 @@
 #    2019-06-16 remove DEVTTY in favor of just showing on current tty
 #    2019-06-16 replace winepath call with wine $WINEPATH_BIN
 #    2019-06-16 split into package-arch-specific and common scripts
+#    2020-05-20 handle multiple filenames correctly now, including removing \r from winepath output
 # Usage:
 #    called from irfanview (which is symlink to irfanview32 or ifanview64)
 #    Do not use this by itself.
@@ -24,7 +25,7 @@ then
    false
 else
 
-IV_VERSION="2019-06-16b"
+IV_VERSION="2020-05-20a"
 
 # Define functions
 expandword() {
@@ -60,9 +61,10 @@ expandword() {
             ;;
          *)
             # assume it is readable and add it to list of files to open
-            echo "File ${_word}"
+            echo "File:1 ${_word}"
             thisfile="$( getwinepath "${_word}" )"
-            irfanfiles="${irfanfiles} ${thisfile}"
+            echo "File:2 ${thisfile}"
+            irfanfiles="${irfanfiles} '${thisfile}'"
             ;;
       esac
    fi
@@ -84,12 +86,12 @@ for word in "${@}";
 do
    expandword "${word}"
 done
-irfanfiles="${irfanfiles## }"
+irfanfiles="$( echo "${irfanfiles## }" | sed -r -e 's/\r//g;' )"
 
 # run wine
 cd $WINEPREFIX
-printf wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles}
-wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} &
+echo wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles}
+eval wine \"${IV_EXEC_PATH}\" "${irfanargs}" "${irfanfiles}" &
 
 wait %1
 for thistempdir in ${alltempdirs};