Browse Source

Fix a typo

Signed-off-by: falkTX <falktx@falktx.com>
pull/25/head
falkTX 1 year ago
parent
commit
138e7861c5
2 changed files with 6 additions and 6 deletions
  1. +3
    -3
      pack-jack2.sh
  2. +3
    -3
      pack-plugins.sh

+ 3
- 3
pack-jack2.sh View File

@@ -48,7 +48,7 @@ if [ "${WIN32}" -eq 1 ]; then
# setup innosetup
dlfile="${PAWPAW_DOWNLOADDIR}/innosetup-6.0.5.exe"
innodir="${PAWPAW_BUILDDIR}/innosetup-6.0.5"
iscc="${innodir}/drive_c/InnoSeup/ISCC.exe"
iscc="${innodir}/drive_c/InnoSetup/ISCC.exe"

# download it
if [ ! -f "${dlfile}" ]; then
@@ -62,8 +62,8 @@ if [ "${WIN32}" -eq 1 ]; then
fi

# install innosetup in custom wineprefix
if [ ! -f "${innodir}"/drive_c/InnoSeup/ISCC.exe ]; then
env WINEPREFIX="${innodir}" wine "${dlfile}" /allusers /dir=C:\\InnoSeup /nocancel /norestart /verysilent
if [ ! -f "${innodir}"/drive_c/InnoSetup/ISCC.exe ]; then
env WINEPREFIX="${innodir}" wine "${dlfile}" /allusers /dir=C:\\InnoSetup /nocancel /norestart /verysilent
fi

# copy jackrouter binaries


+ 3
- 3
pack-plugins.sh View File

@@ -38,14 +38,14 @@ function download_and_install_innosetup {
env WINEPREFIX="${pkgdir}" wineboot -u
fi

if [ ! -f "${pkgdir}"/drive_c/InnoSeup/ISCC.exe ]; then
env WINEPREFIX="${pkgdir}" wine "${dlfile}" /allusers /dir=C:\\InnoSeup /nocancel /norestart /verysilent
if [ ! -f "${pkgdir}"/drive_c/InnoSetup/ISCC.exe ]; then
env WINEPREFIX="${pkgdir}" wine "${dlfile}" /allusers /dir=C:\\InnoSetup /nocancel /norestart /verysilent
fi
}

function create_innosetup_exe {
local pkgdir="${PAWPAW_BUILDDIR}/innosetup-6.0.5"
local iscc="${pkgdir}/drive_c/InnoSeup/ISCC.exe"
local iscc="${pkgdir}/drive_c/InnoSetup/ISCC.exe"

echo "#define VERSION \"${VERSION}\"" > /tmp/pawpaw/version.iss
env WINEPREFIX="${pkgdir}" wine "${iscc}" "setup/inno/${PAWPAW_TARGET}.iss"


Loading…
Cancel
Save