summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-06-16 19:08:29 -0400
committerB Stack <bgstack15@gmail.com>2019-06-16 19:08:29 -0400
commitb7690d916e5f6c39db4aa1d57f712f9df11112a4 (patch)
treecd5d27a900f0d3399745c246668a7092eae8deab
parentirfanview 4.53-2: fix #7 invocation problem for rpm (diff)
downloadstackrpms-b7690d916e5f6c39db4aa1d57f712f9df11112a4.tar.gz
stackrpms-b7690d916e5f6c39db4aa1d57f712f9df11112a4.tar.bz2
stackrpms-b7690d916e5f6c39db4aa1d57f712f9df11112a4.zip
irfanview 4.53-2 dpkg rc1
Split the calling script like the rpm. Still need to fix the icon png generation. I suspect the svg just needs to be rebuilt.
-rwxr-xr-xirfanview/debian/bin/irfanview-common100
-rw-r--r--irfanview/debian/changelog3
-rw-r--r--irfanview/debian/irfanview-common.install1
-rw-r--r--irfanview/debian/irfanview.desktop14
-rwxr-xr-xirfanview/debian/irfanview3289
-rwxr-xr-xirfanview/debian/irfanview6484
-rwxr-xr-xirfanview/irfanview-common2
-rwxr-xr-xirfanview/irfanview326
-rwxr-xr-xirfanview/irfanview643
9 files changed, 133 insertions, 169 deletions
diff --git a/irfanview/debian/bin/irfanview-common b/irfanview/debian/bin/irfanview-common
new file mode 100755
index 0000000..6c178fc
--- /dev/null
+++ b/irfanview/debian/bin/irfanview-common
@@ -0,0 +1,100 @@
+#!/bin/sh
+# File: irfanview-common
+# Locations: /usr/bin
+# Author: bgstack15@gmail.com
+# Startdate: 2016-01-29
+# Title: Common Elements for 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
+# 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_BIN
+# 2019-06-16 split into package-arch-specific and common scripts
+# Usage:
+# called from irfanview (which is symlink to irfanview32 or ifanview64)
+# Do not use this by itself.
+# Reference:
+# Ideas for zip expansion and winepath https://github.com/Zykr/IrfanViewLinux/blob/master/irfanview
+# Improve:
+
+if ! test "${IV_VALID_CALL:-nothing}" = "do_not_set_this_manually" ;
+then
+ printf "%s\n" "Do not call this script by itself! Use \"irfanview\". Aborted."
+ false
+else
+
+IV_VERSION="2019-06-16b"
+
+# 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}"
+ tar -zx -C "${_tmpdir}" -f "${_word}"
+ expandword "${_tmpdir}"
+ ;;
+ *.zip)
+ _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
+ echo "tmpdir ${_tmpdir}"
+ echo "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 ${_word}"
+ thisfile="$( getwinepath "${_word}" )"
+ irfanfiles="${irfanfiles} ${thisfile}"
+ ;;
+ esac
+ fi
+}
+
+getwinepath() {
+ # call: getwinepath "$foo"
+ wine winepath.exe -w "${@}"
+}
+
+# Define variables
+alltempdirs=""
+
+# prepare files
+irfanargs=
+irfanfiles=
+
+for word in "${@}";
+do
+ expandword "${word}"
+done
+irfanfiles="${irfanfiles## }"
+
+# run wine
+cd $WINEPREFIX
+printf wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles}
+wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} &
+
+wait %1
+for thistempdir in ${alltempdirs};
+do
+ rm -rf "${thistempdir}"
+done
+
+fi
diff --git a/irfanview/debian/changelog b/irfanview/debian/changelog
index 5f71d4f..a6edfd7 100644
--- a/irfanview/debian/changelog
+++ b/irfanview/debian/changelog
@@ -1,3 +1,6 @@
+irfanview (4.53-2+devuan) manual; urgency=medium
+
+ * The architecture of the invocation script has been split into common and arch-specific.
irfanview (4.53-1+devuan) manual; urgency=medium
- Version 4.53 Release date: 2019-05-15
diff --git a/irfanview/debian/irfanview-common.install b/irfanview/debian/irfanview-common.install
index d5b3aca..ada28b2 100644
--- a/irfanview/debian/irfanview-common.install
+++ b/irfanview/debian/irfanview-common.install
@@ -1,2 +1,3 @@
debian/irfanview.desktop usr/share/applications/
debian/irfanview-vlc usr/bin/
+debian/bin/irfanview-common usr/bin/
diff --git a/irfanview/debian/irfanview.desktop b/irfanview/debian/irfanview.desktop
index 4a4fcfc..8a601fc 100644
--- a/irfanview/debian/irfanview.desktop
+++ b/irfanview/debian/irfanview.desktop
@@ -1,13 +1,13 @@
[Desktop Entry]
-Version=1.0
-Name=Irfanview
-GenericName=Graphics Viewer
+Categories=Graphics;Viewer;
Comment=View graphics
Exec=/usr/bin/irfanview %F
+GenericName=Graphics Viewer
Icon=irfanview
-Terminal=false
-Type=Application
+Keywords=irfan;graphics;image;viewer;batch;
MimeType=x-content/image-dcf;image/png;image/gif;image/jpeg;image/jpg;image/bmp;image/tiff;image/ico;image/vnd.adobe.photoshop;
+Name=Irfanview
StartupNotify=true
-Categories=Graphics;Viewer;
-Keywords=irfan;graphics;image;viewer;batch;
+Terminal=false
+Type=Application
+Version=1.0
diff --git a/irfanview/debian/irfanview32 b/irfanview/debian/irfanview32
index 66f0ee8..15aef14 100755
--- a/irfanview/debian/irfanview32
+++ b/irfanview/debian/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 "$@"
diff --git a/irfanview/debian/irfanview64 b/irfanview/debian/irfanview64
index b67e43d..51a2e95 100755
--- a/irfanview/debian/irfanview64
+++ b/irfanview/debian/irfanview64
@@ -1,12 +1,17 @@
#!/bin/sh
# File: /usr/bin/irfanview64
+# 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
# 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 +19,8 @@
# load variables
test -z "${IV_WINEPREFIX}" && export IV_WINEPREFIX="$HOME/.wine64"
test -n "${IV_WINEPREFIX}" && export WINEPREFIX="${IV_WINEPREFIX}" || export WINEPREFIX=$HOME/.wine64
-test -z "${IV_DEVTTY}" && export IV_DEVTTY=/dev/null
test -z "${IV_EXEC_NAME}" && export IV_EXEC_NAME="i_view64.exe"
test -z "${IV_EXEC_PATH}" && export IV_EXEC_PATH="/usr/share/irfanview64/i_view64.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 "$@"
diff --git a/irfanview/irfanview-common b/irfanview/irfanview-common
index 8d213da..6c178fc 100755
--- a/irfanview/irfanview-common
+++ b/irfanview/irfanview-common
@@ -70,7 +70,7 @@ expandword() {
getwinepath() {
# call: getwinepath "$foo"
- wine "${IV_WINEPATH_BIN}" -w "${@}"
+ wine winepath.exe -w "${@}"
}
# Define variables
diff --git a/irfanview/irfanview32 b/irfanview/irfanview32
index 7c8218d..15aef14 100755
--- a/irfanview/irfanview32
+++ b/irfanview/irfanview32
@@ -3,13 +3,12 @@
# 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
# 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_BIN
+# 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:
@@ -21,7 +20,6 @@ test -z "${IV_WINEPREFIX}" && export IV_WINEPREFIX="$HOME/.wine"
test -n "${IV_WINEPREFIX}" && export WINEPREFIX="${IV_WINEPREFIX}" || export WINEPREFIX=$HOME/.wine
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"
-test -z "${IV_WINEPATH_BIN}" && export IV_WINEPATH_BIN="/usr/lib/wine/fakedlls/winepath.exe"
export IV_VALID_CALL=do_not_set_this_manually
. irfanview-common "$@"
diff --git a/irfanview/irfanview64 b/irfanview/irfanview64
index d3c16e5..51a2e95 100755
--- a/irfanview/irfanview64
+++ b/irfanview/irfanview64
@@ -9,7 +9,7 @@
# 2019-02-26 remove /etc/default/irfanview 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_BIN
+# 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:
@@ -21,7 +21,6 @@ test -z "${IV_WINEPREFIX}" && export IV_WINEPREFIX="$HOME/.wine64"
test -n "${IV_WINEPREFIX}" && export WINEPREFIX="${IV_WINEPREFIX}" || export WINEPREFIX=$HOME/.wine64
test -z "${IV_EXEC_NAME}" && export IV_EXEC_NAME="i_view64.exe"
test -z "${IV_EXEC_PATH}" && export IV_EXEC_PATH="/usr/share/irfanview64/i_view64.exe"
-test -z "${IV_WINEPATH_BIN}" && export IV_WINEPATH_BIN="/usr/lib64/wine/fakedlls/winepath.exe"
export IV_VALID_CALL=do_not_set_this_manually
. irfanview-common "$@"
bgstack15