diff options
| author | B Stack <bgstack15@gmail.com> | 2020-07-14 11:59:29 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-07-14 11:59:29 -0400 |
| commit | 9e28226d425acdb31cb988b0656535fc656398f9 (patch) | |
| tree | 053350b7e3c79ad0bb1afef2f556faea8aa05ed2 | |
| parent | Merge branch 'waterfox-bump' into 'master' (diff) | |
| download | stackrpms-9e28226d425acdb31cb988b0656535fc656398f9.tar.gz stackrpms-9e28226d425acdb31cb988b0656535fc656398f9.tar.bz2 stackrpms-9e28226d425acdb31cb988b0656535fc656398f9.zip | |
fix #21 irfanview invocation problems again
| -rw-r--r-- | irfanview/debian/changelog | 6 | ||||
| -rw-r--r-- | irfanview/debian/compat | 2 | ||||
| -rwxr-xr-x | irfanview/irfanview-common | 20 | ||||
| -rw-r--r-- | irfanview/irfanview.spec | 7 |
4 files changed, 23 insertions, 12 deletions
diff --git a/irfanview/debian/changelog b/irfanview/debian/changelog index 8295178..29fede5 100644 --- a/irfanview/debian/changelog +++ b/irfanview/debian/changelog @@ -1,3 +1,9 @@ +irfanview (4.54-3+devuan) obs; urgency=low + + - Improve filename handling again + + -- B Stack <bgstack15@gmail.com> Tue, 14 Jul 2020 11:13:27 -0400 + irfanview (4.54-2+devuan) obs; urgency=low - Improve filename handling diff --git a/irfanview/debian/compat b/irfanview/debian/compat index b4de394..48082f7 100644 --- a/irfanview/debian/compat +++ b/irfanview/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/irfanview/irfanview-common b/irfanview/irfanview-common index 9c32c98..9dcb4b0 100755 --- a/irfanview/irfanview-common +++ b/irfanview/irfanview-common @@ -12,6 +12,7 @@ # 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 +# 2020-07-14 use echo binary instead of shell builtin # Usage: # called from irfanview (which is symlink to irfanview32 or ifanview64) # Do not use this by itself. @@ -25,7 +26,8 @@ then false else -IV_VERSION="2020-05-20a" +IV_VERSION="2020-07-14a" +echobin="$( which echo )" # Define functions expandword() { @@ -33,7 +35,7 @@ expandword() { # if file, add it # if directory, expand it # if tarball, extract it and operate on the directory like normal - local _word="$( echo "${@}" | sed -e 'sF\/\/F\/Fg;' )" + local _word="$( ${echobin} "${@}" | sed -e 'sF\/\/F\/Fg;' )" if test -d "${_word}"; then # loop through all files in the directory @@ -48,22 +50,22 @@ expandword() { *.tgz|*.tar.gz) # extract it and expand the temporary directory _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}" - echo "tmpdir ${_tmpdir}" + ${echobin} "tmpdir ${_tmpdir}" tar -zx -C "${_tmpdir}" -f "${_word}" expandword "${_tmpdir}" ;; *.zip) _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}" - echo "tmpdir ${_tmpdir}" - echo "7za e -w${_tmpdir} ${_word}" + ${echobin} "tmpdir ${_tmpdir}" + ${echobin} "7za e -w${_tmpdir} ${_word}" ( cd "${_tmpdir}" ; 7za e "${_word}" ; ) expandword "${_tmpdir}" ;; *) # assume it is readable and add it to list of files to open - echo "File:1 ${_word}" + ${echobin} "File:1 ${_word}" thisfile="$( getwinepath "${_word}" )" - echo "File:2 ${thisfile}" + ${echobin} "File:2 ${thisfile}" irfanfiles="${irfanfiles} '${thisfile}'" ;; esac @@ -86,11 +88,11 @@ for word in "${@}"; do expandword "${word}" done -irfanfiles="$( echo "${irfanfiles## }" | sed -r -e 's/\r//g;' )" +irfanfiles="$( ${echobin} "${irfanfiles## }" | sed -r -e 's/\r//g;' )" # run wine cd $WINEPREFIX -echo wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} +${echobin} wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} eval wine \"${IV_EXEC_PATH}\" "${irfanargs}" "${irfanfiles}" & wait %1 diff --git a/irfanview/irfanview.spec b/irfanview/irfanview.spec index b5dc65d..85c2cdf 100644 --- a/irfanview/irfanview.spec +++ b/irfanview/irfanview.spec @@ -6,7 +6,7 @@ Name: irfanview Version: 4.54 -Release: 2 +Release: 3 Summary: irfanview is a graphics viewer %define version_num %( echo %version | tr -d '\.' ) @@ -204,7 +204,10 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %{_datadir}/%{name}64 %changelog -* Thur Jun 18 2020 B Stack <bgstack15@gmail.com> - 4.54-2 +* Tue Jul 14 2020 B Stack <bgstack15@gmail.com> - 4.54-3 +- Improve filename handling again + +* Thu Jun 18 2020 B Stack <bgstack15@gmail.com> - 4.54-2 - Improve filename handling * Wed Dec 18 2019 B Stack <bgstack15@gmail.com> - 4.54-1 |