Merge branch 'irfanview-bump' into 'master'

Fix Irfanview calling script, and icons

Closes #7

See merge request bgstack15/stackrpms!67

1 files changed, 10 insertions, 79 deletions

diff --git a/irfanview/irfanview32 b/irfanview/irfanview32
index 66f0ee8..15aef14 100755
--- a/irfanview/irfanview32
+++ b/irfanview/irfanview32
@@ -1,12 +1,16 @@
 #!/bin/sh
-# File: /usr/bin/irfanview
+# File: /usr/bin/irfanview32
+# Locations: symlink /usr/bin/irfanview
 # Author: bgstack15@gmail.com
 # Startdate: 2016-01-29
-# Title: Wrapper script for passing files to Irfanview
-# Purpose: Converts file paths to a wine format and also handles compressed files
+# Title: Wrapper script for passing files to Irfanview # Purpose: Converts file paths to a wine format and also handles compressed files
 # History: 2016-01-29 Initial quick script written. It used a bunch of sed commands to transform paths to a wine format.
 #    2019-02-26 remove /etc/default/irfanview file
-# Usage: irfan /path/to/image /another/image/file
+#    2019-06-01 fix invocation for single item with space in name. Cannot call multiple objcts with spaces in filename.
+#    2019-06-16 remove DEVTTY in favor of just showing on current tty
+#    2019-06-16 replace winepath call with wine winepath.exe
+#    2019-06-16 split into package-arch-specific and common scripts
+# Usage: irfanview /path/to/image /another/image/file
 # Reference:
 #    Ideas for zip expansion and winepath https://github.com/Zykr/IrfanViewLinux/blob/master/irfanview
 # Improve:
@@ -14,81 +18,8 @@
 # load variables
 test -z "${IV_WINEPREFIX}" && export IV_WINEPREFIX="$HOME/.wine"
 test -n "${IV_WINEPREFIX}" && export WINEPREFIX="${IV_WINEPREFIX}" || export WINEPREFIX=$HOME/.wine
-test -z "${IV_DEVTTY}" && export IV_DEVTTY=/dev/null
 test -z "${IV_EXEC_NAME}" && export IV_EXEC_NAME="i_view32.exe"
 test -z "${IV_EXEC_PATH}" && export IV_EXEC_PATH="/usr/share/irfanview32/i_view32.exe"
+export IV_VALID_CALL=do_not_set_this_manually
 
-IV_VERSION="2019-02-26a"
-
-# Define functions
-expandword() {
-   # call: expandword "${word}"
-   # 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;' )"
-   if test -d "${_word}";
-   then
-      # loop through all files in the directory
-      for _newword in "${_word}"/*;
-      do
-         expandword "${_newword}";
-      done
-   elif test -f "${_word}";
-   then
-      # file exists so check if tarball
-      case "${_word}" in
-         *.tgz|*.tar.gz)
-            # extract it and expand the temporary directory
-            _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
-            echo "tmpdir ${_tmpdir}" 1>${IV_DEVTTY}
-            tar -zx -C "${_tmpdir}" -f "${_word}" 1>${IV_DEVTTY} 2>&1
-            expandword "${_tmpdir}"
-            ;;
-         *.zip)
-            _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
-            echo "tmpdir ${_tmpdir}" 1>${IV_DEVTTY}
-            echo "7za e -w${_tmpdir} ${_word}" 1>${IV_DEVTTY} 2>&1
-            ( cd "${_tmpdir}"; 7za e "${_word}" 1>${IV_DEVTTY} 2>&1; )
-            expandword "${_tmpdir}"
-            ;;
-         *)
-            # assume it is readable and add it to list of files to open
-            echo "File ${_word}" 1>${IV_DEVTTY}
-            thisfile="$( getwinepath "${_word}" )"
-            irfanfiles="${irfanfiles} \"${thisfile}\""
-            ;;
-      esac
-   fi
-}
-
-getwinepath() {
-   # call: getwinepath "$foo"
-   winepath -w "${@}"
-}
-
-# Define variables
-alltempdirs=""
-
-# prepare files
-irfanargs=
-irfanfiles=
-
-for word in "${@}";
-do
-   expandword "${word}"
-done
-irfanfiles="${irfanfiles## }"
-
-# run wine
-cd $WINEPREFIX
-echo "${irfanfiles}" | xargs echo wine "${IV_EXEC_PATH}" ${irfanargs} > ${IV_DEVTTY}
-echo "${irfanfiles}" | xargs wine "${IV_EXEC_PATH}"  ${irfanargs} &
-
-#wait $( pgrep -P $$ ${IV_EXEC_NAME} )
-# WORKHERE try wait with:
-wait %1
-for thistempdir in ${alltempdirs};
-do
-   rm -rf "${thistempdir}" 1>${IV_DEVTTY}
-done
+. irfanview-common "$@"