Skip to content

Commit

Permalink
Fix a typo
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <[email protected]>
  • Loading branch information
falkTX committed Oct 13, 2021
1 parent bcbb4fa commit 138e786
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions pack-jack2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pack-plugins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 138e786

Please sign in to comment.