change UNZIP to UNZIPPER to make OAPack work

diff --git a/Makefile b/Makefile
index 564a3c97f89d2050189fb9fbc5a2dd3a2e84da60..a300b6af4e9d861f38d252f4611f4e1381d232f5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ GIT                ?= git
 SVN                ?= svn
 WGET               ?= wget
 MV                 ?= mv
-UNZIP              ?= unzip
+UNZIPPER           ?= unzip
 
 FD_TO_DEVNULL      ?= >/dev/null
 STDOUT_TO_DEVNULL  ?= 1$(FD_TO_DEVNULL)
@@ -289,7 +289,7 @@ dependencies-check:
        checkbinary binutils "$(RANLIB)"; \
        checkbinary binutils "$(AR)"; \
        checkbinary pkg-config "$(PKGCONFIG)"; \
-       checkbinary unzip "$(UNZIP)"; \
+       checkbinary unzip "$(UNZIPPER)"; \
        checkbinary git-core "$(GIT)"; \
        checkbinary subversion "$(SVN)"; \
        checkbinary wget "$(WGET)"; \
@@ -975,7 +975,7 @@ install-data: binaries
        $(MKDIR) $(INSTALLDIR)/games
        $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
        [ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/
-       DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIP="$(UNZIP)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)"
+       DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIPPER="$(UNZIPPER)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)"
        $(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
        $(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR
        $(CP_R) setup/data/tools/* $(INSTALLDIR)/

diff --git a/download-gamepacks.sh b/download-gamepacks.sh
index 389588872443f560fc19e036d196d2259ab63c7a..6d9791d856deffb0100d3406b61edc608b2cf7aa 100755 (executable)
--- a/download-gamepacks.sh
+++ b/download-gamepacks.sh
@@ -11,7 +11,7 @@
 : ${MKDIR:=mkdir}
 : ${RM_R:=rm -f -r}
 : ${MV:=mv}
-: ${UNZIP:=unzip}
+: ${UNZIPPER:=unzip}
 
 set -e
 
@@ -42,7 +42,7 @@ pack()
                                $MKDIR zipdownload
                                cd zipdownload
                                $WGET "$source" "$@" || true
-                               $UNZIP * || true
+                               $UNZIPPER *.zip || true
                                cd ..
                                $RM_R "games/$pack"
                                $MKDIR "games/$pack"
@@ -119,7 +119,7 @@ pack()
                        $MKDIR zipdownload
                        cd zipdownload
                        $WGET "$source" "$@" || true
-                       $UNZIP * || true
+                       $UNZIPPER *.zip || true
                        cd ..
                        $MKDIR "games/$pack"
                        $MV zipdownload/*/* "games/$pack/" || true