quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change UNZIP to UNZIPPER to make OAPack work

Browse Source
This commit is contained in:
Rudolf Polzer 2010-12-05 17:27:36 +01:00
parent 44cc83f2c4
commit 85fdf3de30
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -48,7 +48,7 @@ GIT ?= git
SVN ?= svn SVN ?= svn
WGET ?= wget WGET ?= wget
MV ?= mv MV ?= mv
UNZIP ?= unzip UNZIPPER ?= unzip
FD_TO_DEVNULL ?= >/dev/null FD_TO_DEVNULL ?= >/dev/null
STDOUT_TO_DEVNULL ?= 1$(FD_TO_DEVNULL) STDOUT_TO_DEVNULL ?= 1$(FD_TO_DEVNULL)
@ -289,7 +289,7 @@ dependencies-check:
checkbinary binutils "$(RANLIB)"; \ checkbinary binutils "$(RANLIB)"; \
checkbinary binutils "$(AR)"; \ checkbinary binutils "$(AR)"; \
checkbinary pkg-config "$(PKGCONFIG)"; \ checkbinary pkg-config "$(PKGCONFIG)"; \
checkbinary unzip "$(UNZIP)"; \ checkbinary unzip "$(UNZIPPER)"; \
checkbinary git-core "$(GIT)"; \ checkbinary git-core "$(GIT)"; \
checkbinary subversion "$(SVN)"; \ checkbinary subversion "$(SVN)"; \
checkbinary wget "$(WGET)"; \ checkbinary wget "$(WGET)"; \
@ -975,7 +975,7 @@ install-data: binaries
$(MKDIR) $(INSTALLDIR)/games $(MKDIR) $(INSTALLDIR)/games
$(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
[ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/ [ "$(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_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
$(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR $(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR
$(CP_R) setup/data/tools/* $(INSTALLDIR)/ $(CP_R) setup/data/tools/* $(INSTALLDIR)/

6
download-gamepacks.sh
View File

@ -11,7 +11,7 @@
: ${MKDIR:=mkdir} : ${MKDIR:=mkdir}
: ${RM_R:=rm -f -r} : ${RM_R:=rm -f -r}
: ${MV:=mv} : ${MV:=mv}
: ${UNZIP:=unzip} : ${UNZIPPER:=unzip}
set -e set -e
@ -42,7 +42,7 @@ pack()
$MKDIR zipdownload $MKDIR zipdownload
cd zipdownload cd zipdownload
$WGET "$source" "$@" || true $WGET "$source" "$@" || true
$UNZIP * || true $UNZIPPER *.zip || true
cd .. cd ..
$RM_R "games/$pack" $RM_R "games/$pack"
$MKDIR "games/$pack" $MKDIR "games/$pack"
@ -119,7 +119,7 @@ pack()
$MKDIR zipdownload $MKDIR zipdownload
cd zipdownload cd zipdownload
$WGET "$source" "$@" || true $WGET "$source" "$@" || true
$UNZIP * || true $UNZIPPER *.zip || true
cd .. cd ..
$MKDIR "games/$pack" $MKDIR "games/$pack"
$MV zipdownload/*/* "games/$pack/" || true $MV zipdownload/*/* "games/$pack/" || true