Permalink
Browse files

remove unused installer files / disable portable install (broken)

  • Loading branch information...
abma committed Oct 19, 2015
1 parent c29f520 commit da598d8053517cadfa416346599cc8466708994d
Showing with 3 additions and 85 deletions.
  1. +0 −63 installer/make_portable_archive.sh
  2. +1 −1 installer/sections/portable.nsh
  3. +2 −0 installer/springlobby.nsi
  4. +0 −21 installer/springsettings.nsh
@@ -1,63 +0,0 @@
#!/bin/bash
set -e
if [ $# -lt 1 ]; then
echo "Usage: $0 <spring_VERSION.exe> <outputpath>"
exit
fi
# check req.
`which wine &> /dev/null` || (echo "Error: You need wine installed!"; exit)
`which winepath &> /dev/null` || (echo "Error: You need winepath installed!"; exit)
`which 7z &> /dev/null` || (echo "Error: You need 7z installed!"; exit)
# prepare
INSTALLER=$1
OUTPUTPATH=$2
if [ -n ${OUTPUTPATH} ]; then
if [ ! -d ${OUTPUTPATH} ]; then
echo "${OUTPUTPATH} doesn't exist!"
exit 1
fi
OUTPUTPATH="${OUTPUTPATH}/"
fi
VERSION=`basename ${INSTALLER} .exe`
VERSION=${VERSION:7}
echo ${VERSION} detected
TEMPDIR=`mktemp -d`
echo Temporary directory: ${TEMPDIR}
# create a tempdir
PATHNAME=spring-${VERSION}
INSTPATH=${TEMPDIR}/${PATHNAME}
mkdir -p "${INSTPATH}"
# detect wine `windows` peth of the tempdir
WINEINSTPATH=`winepath -w "${INSTPATH}"`
if [ "${WINEINSTPATH:0:4}" = "\\\\?\\" ]; then
echo "Error: Couldn't translate tempdir path"
exit
fi
# make the path passable via linux bash \ -> \\
WINEINSTPATH="${WINEINSTPATH//\\/\\\\}"
# install in tempdir via wine
INSTCOMMAND="wine ${INSTALLER} /S /PORTABLE /NOREGISTRY /NODESKTOPLINK /NOSTARTMENU /D=$WINEINSTPATH"
echo $INSTCOMMAND
if ! sh -c "$INSTCOMMAND" ; then
echo "Error: Installation failed"
exit
fi
# compress
7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=64m -ms=on ${OUTPUTPATH}spring_${VERSION}_portable.7z ${INSTPATH}
rm -rf ${TEMPDIR}
@@ -2,7 +2,7 @@
SetOutPath "$INSTDIR"
!insertmacro createemptyfile "$INSTDIR\springlobby.conf"
WriteINIStr "$INSTDIR\springlobby.conf" Spring DownloadDir $INSTDIR
!else
Delete "$INSTDIR\springsettings.cfg"
@@ -130,6 +130,8 @@ SectionEnd
Section /o "Portable" SEC_PORTABLE
; make this section read-only -> portable is currently broken / not fully implemented
SectionIn RO
!define INSTALL
${!echonow} "Processing: Portable"
!include "sections\portable.nsh"
@@ -1,21 +0,0 @@
!ifdef TEST_BUILD
!define PRODUCT_NAME "Spring - Test Build"
!else
!define PRODUCT_NAME "Spring"
!endif
!define PRODUCT_VERSION "${VERSION_TAG}"
!define SP_BASENAME "spring_${PRODUCT_VERSION}"
!define PRODUCT_PUBLISHER "Spring team"
!define PRODUCT_WEB_SITE "http://www.springrts.com"
; This is required, and has to be a string constant
; (can not contain defines like ${BLA})
VIProductVersion "0.0.0.1"
VIAddVersionKey "ProductName" "Spring RTS engine"
VIAddVersionKey "CompanyName" "Spring community"
VIAddVersionKey "LegalCopyright" "GNU GPL V2 and V3"
VIAddVersionKey "FileDescription" "Engine launcher executable"
VIAddVersionKey "FileVersion" "${VERSION_TAG}"

0 comments on commit da598d8

Please sign in to comment.