r8505 - packages/trunk/rott/debian

[Fabian Greffrath]

Author: fabian-guest
Date: 2008-12-14 00:24:30 +0000 (Sun, 14 Dec 2008)
New Revision: 8505

Modified:
   packages/trunk/rott/debian/changelog
   packages/trunk/rott/debian/control
   packages/trunk/rott/debian/rott.postinst
Log:
  * debian/control, debian/rott.postinst:
    + Accept p7zip-full as an alternative to unzip to extract the shareware
      zip files.



Modified: packages/trunk/rott/debian/changelog
===================================================================
--- packages/trunk/rott/debian/changelog	2008-12-13 22:45:02 UTC (rev 8504)
+++ packages/trunk/rott/debian/changelog	2008-12-14 00:24:30 UTC (rev 8505)
@@ -9,6 +9,9 @@
     + New patch to add a generic rott.desktop file into the misc/ directory.
   * debian/rott.menu:
     + Changed to match rott.desktop.
+  * debian/control, debian/rott.postinst:
+    + Accept p7zip-full as an alternative to unzip to extract the shareware
+      zip files.
 
  -- Fabian Greffrath <fabian at debian-unofficial.org>  Sat, 13 Dec 2008 23:20:00 +0100
 

Modified: packages/trunk/rott/debian/control
===================================================================
--- packages/trunk/rott/debian/control	2008-12-13 22:45:02 UTC (rev 8504)
+++ packages/trunk/rott/debian/control	2008-12-14 00:24:30 UTC (rev 8505)
@@ -12,7 +12,7 @@
 Package: rott
 Section: contrib/games
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, wget, unzip
+Depends: ${shlibs:Depends}, ${misc:Depends}, wget, unzip | p7zip-full
 Recommends: freepats, timidity
 Description: Rise of the Triad -- The HUNT Begins
  Rise of the Triad is a high quality, fast scrolling first-person perspective

Modified: packages/trunk/rott/debian/rott.postinst
===================================================================
--- packages/trunk/rott/debian/rott.postinst	2008-12-13 22:45:02 UTC (rev 8504)
+++ packages/trunk/rott/debian/rott.postinst	2008-12-14 00:24:30 UTC (rev 8505)
@@ -10,6 +10,14 @@
 SHAREMD5="0fafd6b629eab80278fc726e31f9cf41"
 DOCDIR="/usr/share/doc/rott"
 
+if [ -x "$(which unzip)" ]; then
+	UNZIP="unzip -o"
+elif [ -x "$(which 7za)" ]; then
+	UNZIP="7za e -y"
+elif [ -x "$(which 7z)" ]; then
+	UNZIP="7z e -y"
+fi
+
 SUCCESS=0
 COUNTER=0
 MAXCOUNT=3
@@ -40,8 +48,8 @@
 
 				# Check zip file integrity, then install
 				if [ "$(md5sum $SHAREDIR/$SHAREZIP | cut -f1 -d' ')" = "$SHAREMD5" ]; then
-					unzip -o ${SHAREDIR}/${SHAREZIP} -d ${SHAREDIR} > /dev/null && \
-					unzip -o ${SHAREDIR}/ROTTSW13.SHR -d ${SHAREDIR} > /dev/null && \
+					cd ${SHAREDIR} && eval ${UNZIP} ${SHAREZIP} > /dev/null && \
+					cd ${SHAREDIR} && eval ${UNZIP} ROTTSW13.SHR > /dev/null && \
 					chmod -f 0644 ${SHAREDIR}/* && \
 					rm -f ${SHAREDIR}/ROTTSW13.SHR ${SHAREDIR}/INSTALL.EXE ${SHAREDIR}/FILE_ID.DIZ && \
 					ln -sf ${SHAREDIR}/VENDOR.DOC ${DOCDIR}/vendor.doc && \