From 03798adb8363f805f9d185bb059f09a870942bc0 Mon Sep 17 00:00:00 2001 From: vv221 Date: Wed, 26 Sep 2018 17:18:35 +0200 Subject: [PATCH 1/6] =?UTF-8?q?Icewind=20Dale=20-=20Enhanced=20Edition=20?= =?UTF-8?q?=E2=80=94=20Update=20script=20to=202.10=20syntax?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../play-icewind-dale-enhanced-edition.sh | 128 ++++++++++-------- 1 file changed, 70 insertions(+), 58 deletions(-) diff --git a/play.it-2/games/play-icewind-dale-enhanced-edition.sh b/play.it-2/games/play-icewind-dale-enhanced-edition.sh index ca215239..ad5d3cb5 100755 --- a/play.it-2/games/play-icewind-dale-enhanced-edition.sh +++ b/play.it-2/games/play-icewind-dale-enhanced-edition.sh @@ -30,11 +30,11 @@ set -o errexit ### # Icewind Dale - Enhanced Edition -# build native Linux packages from the original installers +# build native packages from the original installers # send your bug reports to vv221@dotslashplay.it ### -script_version=20180514.1 +script_version=20180926.1 # Set game-specific variables @@ -48,33 +48,34 @@ ARCHIVE_GOG_SIZE='2900000' ARCHIVE_GOG_VERSION='2.5.16.3-gog20626' ARCHIVE_GOG_TYPE='mojosetup' -ARCHIVE_GOG_OLD='gog_icewind_dale_enhanced_edition_2.1.0.5.sh' -ARCHIVE_GOG_OLD_MD5='fc7244f4793eec365b8ac41d91a4edbb' -ARCHIVE_GOG_OLD_SIZE='2900000' -ARCHIVE_GOG_OLD_VERSION='1.4.0-gog2.1.0.5' +ARCHIVE_GOG_OLD0='gog_icewind_dale_enhanced_edition_2.1.0.5.sh' +ARCHIVE_GOG_OLD0_MD5='fc7244f4793eec365b8ac41d91a4edbb' +ARCHIVE_GOG_OLD0_SIZE='2900000' +ARCHIVE_GOG_OLD0_VERSION='1.4.0-gog2.1.0.5' -ARCHIVE_LIBSSL_32='libssl_1.0.0_32-bit.tar.gz' -ARCHIVE_LIBSSL_32_MD5='9443cad4a640b2512920495eaf7582c4' +ARCHIVE_OPTIONAL_LIBSSL32='libssl_1.0.0_32-bit.tar.gz' +ARCHIVE_OPTIONAL_LIBSSL32_MD5='9443cad4a640b2512920495eaf7582c4' -ARCHIVE_ICONS_PACK='icewind-dale-enhanced-edition_icons.tar.gz' -ARCHIVE_ICONS_PACK_MD5='afe7a2a8013a859f7b56a3104eacd783' +ARCHIVE_OPTIONAL_ICONS='icewind-dale-enhanced-edition_icons.tar.gz' +ARCHIVE_OPTIONAL_ICONS_MD5='afe7a2a8013a859f7b56a3104eacd783' ARCHIVE_DOC_PATH='data/noarch/docs' -ARCHIVE_DOC_FILES='./*' +ARCHIVE_DOC_FILES='*' ARCHIVE_GAME_BIN_PATH='data/noarch/game' -ARCHIVE_GAME_BIN_FILES='./IcewindDale' +ARCHIVE_GAME_BIN_FILES='IcewindDale' ARCHIVE_GAME_L10N_PATH='data/noarch/game' -ARCHIVE_GAME_L10N_FILES='./lang' +ARCHIVE_GAME_L10N_FILES='lang' ARCHIVE_GAME_DATA_PATH='data/noarch/game' -ARCHIVE_GAME_DATA_FILES='./data ./movies ./music ./scripts ./chitin.key' +ARCHIVE_GAME_DATA_FILES='data movies music scripts chitin.key' ARCHIVE_ICONS_PATH='.' -ARCHIVE_ICONS_FILES='./16x16 ./32x32 ./48x48 ./64x64 ./128x128 ./256x256' +ARCHIVE_ICONS_FILES='16x16 32x32 48x48 64x64 128x128 256x256' APP_MAIN_TYPE='native' +APP_MAIN_LIBS='libs' APP_MAIN_EXE='IcewindDale' APP_MAIN_ICON_GOG='data/noarch/support/icon.png' @@ -92,43 +93,42 @@ PKG_BIN_DEPS_ARCH='lib32-openssl-1.0' # Load common functions -target_version='2.8' +target_version='2.10' if [ -z "$PLAYIT_LIB2" ]; then - [ -n "$XDG_DATA_HOME" ] || XDG_DATA_HOME="$HOME/.local/share" + : ${XDG_DATA_HOME:="$HOME/.local/share"} for path in\ - './'\ - "$XDG_DATA_HOME/play.it/"\ - "$XDG_DATA_HOME/play.it/play.it-2/lib/"\ - '/usr/local/share/games/play.it/'\ - '/usr/local/share/play.it/'\ - '/usr/share/games/play.it/'\ - '/usr/share/play.it/' + "$PWD"\ + "$XDG_DATA_HOME/play.it"\ + '/usr/local/share/games/play.it'\ + '/usr/local/share/play.it'\ + '/usr/share/games/play.it'\ + '/usr/share/play.it' do - if [ -z "$PLAYIT_LIB2" ] && [ -e "$path/libplayit2.sh" ]; then + if [ -e "$path/libplayit2.sh" ]; then PLAYIT_LIB2="$path/libplayit2.sh" break fi done - if [ -z "$PLAYIT_LIB2" ]; then - printf '\n\033[1;31mError:\033[0m\n' - printf 'libplayit2.sh not found.\n' - exit 1 - fi +fi +if [ -z "$PLAYIT_LIB2" ]; then + printf '\n\033[1;31mError:\033[0m\n' + printf 'libplayit2.sh not found.\n' + exit 1 fi . "$PLAYIT_LIB2" # Try to load icons archive ARCHIVE_MAIN="$ARCHIVE" -archive_set 'ARCHIVE_ICONS' 'ARCHIVE_ICONS_PACK' +archive_set 'ARCHIVE_ICONS' 'ARCHIVE_OPTIONAL_ICONS' ARCHIVE="$ARCHIVE_MAIN" -# Use libSSL 1.0.0 32-bit archive unless building for Arch Linux +# Use libSSL 1.0.0 32-bit archive (Debian packages only) -if [ "$OPTION_PACKAGE" != 'arch' ]; then +if [ "$OPTION_PACKAGE" = 'deb' ]; then ARCHIVE_MAIN="$ARCHIVE" - archive_set 'ARCHIVE_LIBSSL' 'ARCHIVE_LIBSSL_32' + archive_set 'ARCHIVE_LIBSSL32' 'ARCHIVE_OPTIONAL_LIBSSL32' ARCHIVE="$ARCHIVE_MAIN" fi @@ -147,21 +147,19 @@ if [ "$ARCHIVE_ICONS" ]; then ) organize_data 'ICONS' "$PATH_ICON_BASE" else - get_icon_from_temp_dir 'APP_MAIN' + icons_get_from_workdir 'APP_MAIN' fi rm --recursive "$PLAYIT_WORKDIR/gamedata" -# Include libSSL into the game directory +# Include libSSL 1.0.0 32-bit (Debian packages only) -if [ "$ARCHIVE_LIBSSL" ]; then +if [ "$ARCHIVE_LIBSSL32" ]; then ( - ARCHIVE='ARCHIVE_LIBSSL' - extract_data_from "$ARCHIVE_LIBSSL" + ARCHIVE='ARCHIVE_LIBSSL32' + extract_data_from "$ARCHIVE_LIBSSL32" ) - dir='libs' - mkdir --parents "${PKG_BIN_PATH}${PATH_GAME}/$dir" - mv "$PLAYIT_WORKDIR/gamedata"/* "${PKG_BIN_PATH}${PATH_GAME}/$dir" - APP_MAIN_LIBS="$dir" + mkdir --parents "${PKG_BIN_PATH}${PATH_GAME}/$APP_MAIN_LIBS" + mv "$PLAYIT_WORKDIR/gamedata"/* "${PKG_BIN_PATH}${PATH_GAME}/$APP_MAIN_LIBS" rm --recursive "$PLAYIT_WORKDIR/gamedata" fi @@ -172,21 +170,35 @@ write_launcher 'APP_MAIN' # Build package -cat > "$postinst" << EOF -if [ ! -e /lib/i386-linux-gnu/libjson.so.0 ]; then - if [ -e /lib/i386-linux-gnu/libjson-c.so ] ; then - ln --symbolic libjson-c.so /lib/i386-linux-gnu/libjson.so.0 - elif [ -e /lib/i386-linux-gnu/libjson-c.so.2 ] ; then - ln --symbolic libjson-c.so.2 /lib/i386-linux-gnu/libjson.so.0 - elif [ -e /lib/i386-linux-gnu/libjson-c.so.3 ] ; then - ln --symbolic libjson-c.so.3 /lib/i386-linux-gnu/libjson.so.0 - fi -fi -if [ ! -e /usr/lib32/libjson.so.0 ] && [ -e /usr/lib32/libjson-c.so ] ; then - ln --symbolic libjson-c.so /usr/lib32/libjson.so.0 -fi -EOF - +case "$ARCHIVE" in + ('ARCHIVE_GOG_OLD0') + case "$OPTION_PACKAGE" in + ('arch') + cat > "$postinst" <<- EOF + if [ ! -e /usr/lib32/libjson.so.0 ] && [ -e /usr/lib32/libjson-c.so ] ; then + ln --symbolic /usr/lib32/libjson-c.so "$PATH_GAME/$APP_MAIN_LIBS/libjson.so.0" + fi + EOF + ;; + ('deb') + cat > "$postinst" <<- EOF + if [ ! -e /lib/i386-linux-gnu/libjson.so.0 ]; then + mdir --parents "$PATH_GAME/$APP_MAIN_LIBS" + for file in\ + libjson-c.so\ + libjson-c.so.2\ + libjson-c.so.3\ + do + if [ -e "/lib/i386-linux-gnu/$file" ] ; then + ln --symbolic "/lib/i386-linux-gnu/$file" "$PATH_GAME/$APP_MAIN_LIBS/libjson.so.0" + break + fi + fi + EOF + ;; + esac + ;; +esac write_metadata 'PKG_BIN' write_metadata 'PKG_L10N' 'PKG_DATA' build_pkg -- GitLab From dca6d5a5e1e5f14ff57e9790e2bc643ac14c1005 Mon Sep 17 00:00:00 2001 From: vv221 Date: Wed, 26 Sep 2018 18:03:32 +0200 Subject: [PATCH 2/6] =?UTF-8?q?Icewind=20Dale=20-=20Enhanced=20Edition=20?= =?UTF-8?q?=E2=80=94=20Change=20game=20id:=20icewind-dale-enhanced-edition?= =?UTF-8?q?=20=E2=86=92=20icewind-dale-1-enhanced-edition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sh => play-icewind-dale-1-enhanced-edition.sh} | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) rename play.it-2/games/{play-icewind-dale-enhanced-edition.sh => play-icewind-dale-1-enhanced-edition.sh} (89%) diff --git a/play.it-2/games/play-icewind-dale-enhanced-edition.sh b/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh similarity index 89% rename from play.it-2/games/play-icewind-dale-enhanced-edition.sh rename to play.it-2/games/play-icewind-dale-1-enhanced-edition.sh index ad5d3cb5..f55528ea 100755 --- a/play.it-2/games/play-icewind-dale-enhanced-edition.sh +++ b/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh @@ -34,11 +34,11 @@ set -o errexit # send your bug reports to vv221@dotslashplay.it ### -script_version=20180926.1 +script_version=20180926.2 # Set game-specific variables -GAME_ID='icewind-dale-enhanced-edition' +GAME_ID='icewind-dale-1-enhanced-edition' GAME_NAME='Icewind Dale - Enhanced Edition' ARCHIVE_GOG='icewind_dale_enhanced_edition_en_2_5_16_3_20626.sh' @@ -56,8 +56,9 @@ ARCHIVE_GOG_OLD0_VERSION='1.4.0-gog2.1.0.5' ARCHIVE_OPTIONAL_LIBSSL32='libssl_1.0.0_32-bit.tar.gz' ARCHIVE_OPTIONAL_LIBSSL32_MD5='9443cad4a640b2512920495eaf7582c4' -ARCHIVE_OPTIONAL_ICONS='icewind-dale-enhanced-edition_icons.tar.gz' -ARCHIVE_OPTIONAL_ICONS_MD5='afe7a2a8013a859f7b56a3104eacd783' +ARCHIVE_OPTIONAL_ICONS='icewind-dale-1-enhanced-edition_icons.tar.gz' +ARCHIVE_OPTIONAL_ICONS_URL='https://www.dotslashplay.it/ressources/icewind-dale-1-enhanced-edition/' +ARCHIVE_OPTIONAL_ICONS_MD5='2e7db406aca79f9182c4efa93df80bf4' ARCHIVE_DOC_PATH='data/noarch/docs' ARCHIVE_DOC_FILES='*' @@ -83,13 +84,19 @@ PACKAGES_LIST='PKG_BIN PKG_L10N PKG_DATA' PKG_L10N_ID="${GAME_ID}-l10n" PKG_L10N_DESCRIPTION='localizations' +# Easier upgrade from packages generated with pre-20180926.2 scripts +PKG_L10N_PROVIDE='icewind-dale-enhanced-edition-l10n' PKG_DATA_ID="${GAME_ID}-data" PKG_DATA_DESCRIPTION='data' +# Easier upgrade from packages generated with pre-20180926.2 scripts +PKG_DATA_PROVIDE='icewind-dale-enhanced-edition-data' PKG_BIN_ARCH='32' PKG_BIN_DEPS="$PKG_L10N_ID $PKG_DATA_ID glibc libstdc++ glx openal json" PKG_BIN_DEPS_ARCH='lib32-openssl-1.0' +# Easier upgrade from packages generated with pre-20180926.2 scripts +PKG_BIN_PROVIDE='icewind-dale-enhanced-edition' # Load common functions -- GitLab From 6d5d1ce59b8f1f47687a16e2c10c69a9833ca437 Mon Sep 17 00:00:00 2001 From: vv221 Date: Wed, 26 Sep 2018 18:08:00 +0200 Subject: [PATCH 3/6] =?UTF-8?q?Icewind=20Dale=20-=20Enhanced=20Edition=20?= =?UTF-8?q?=E2=80=94=20Add=20support=20for=2064-bit=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../play-icewind-dale-1-enhanced-edition.sh | 74 +++++++++++++++---- 1 file changed, 59 insertions(+), 15 deletions(-) diff --git a/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh b/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh index f55528ea..81865cc1 100755 --- a/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh +++ b/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh @@ -34,7 +34,7 @@ set -o errexit # send your bug reports to vv221@dotslashplay.it ### -script_version=20180926.2 +script_version=20180926.3 # Set game-specific variables @@ -54,8 +54,13 @@ ARCHIVE_GOG_OLD0_SIZE='2900000' ARCHIVE_GOG_OLD0_VERSION='1.4.0-gog2.1.0.5' ARCHIVE_OPTIONAL_LIBSSL32='libssl_1.0.0_32-bit.tar.gz' +ARCHIVE_OPTIONAL_LIBSSL32_URL='https://www.dotslashplay.it/ressources/libssl/' ARCHIVE_OPTIONAL_LIBSSL32_MD5='9443cad4a640b2512920495eaf7582c4' +ARCHIVE_OPTIONAL_LIBSSL64='libssl_1.0.0_64-bit.tar.gz' +ARCHIVE_OPTIONAL_LIBSSL64_URL='https://www.dotslashplay.it/ressources/libssl/' +ARCHIVE_OPTIONAL_LIBSSL64_MD5='89917bef5dd34a2865cb63c2287e0bd4' + ARCHIVE_OPTIONAL_ICONS='icewind-dale-1-enhanced-edition_icons.tar.gz' ARCHIVE_OPTIONAL_ICONS_URL='https://www.dotslashplay.it/ressources/icewind-dale-1-enhanced-edition/' ARCHIVE_OPTIONAL_ICONS_MD5='2e7db406aca79f9182c4efa93df80bf4' @@ -63,8 +68,11 @@ ARCHIVE_OPTIONAL_ICONS_MD5='2e7db406aca79f9182c4efa93df80bf4' ARCHIVE_DOC_PATH='data/noarch/docs' ARCHIVE_DOC_FILES='*' -ARCHIVE_GAME_BIN_PATH='data/noarch/game' -ARCHIVE_GAME_BIN_FILES='IcewindDale' +ARCHIVE_GAME_BIN32_PATH='data/noarch/game' +ARCHIVE_GAME_BIN32_FILES='IcewindDale' + +ARCHIVE_GAME_BIN64_PATH='data/noarch/game' +ARCHIVE_GAME_BIN64_FILES='IcewindDale64' ARCHIVE_GAME_L10N_PATH='data/noarch/game' ARCHIVE_GAME_L10N_FILES='lang' @@ -77,10 +85,13 @@ ARCHIVE_ICONS_FILES='16x16 32x32 48x48 64x64 128x128 256x256' APP_MAIN_TYPE='native' APP_MAIN_LIBS='libs' -APP_MAIN_EXE='IcewindDale' +APP_MAIN_EXE_BIN32='IcewindDale' +APP_MAIN_EXE_BIN64='IcewindDale64' APP_MAIN_ICON_GOG='data/noarch/support/icon.png' -PACKAGES_LIST='PKG_BIN PKG_L10N PKG_DATA' +PACKAGES_LIST='PKG_BIN32 PKG_BIN64 PKG_L10N PKG_DATA' +# Keep compatibility with old archives +PACKAGES_LIST_GOG_OLD0='PKG_BIN32 PKG_L10N PKG_DATA' PKG_L10N_ID="${GAME_ID}-l10n" PKG_L10N_DESCRIPTION='localizations' @@ -92,11 +103,19 @@ PKG_DATA_DESCRIPTION='data' # Easier upgrade from packages generated with pre-20180926.2 scripts PKG_DATA_PROVIDE='icewind-dale-enhanced-edition-data' -PKG_BIN_ARCH='32' -PKG_BIN_DEPS="$PKG_L10N_ID $PKG_DATA_ID glibc libstdc++ glx openal json" -PKG_BIN_DEPS_ARCH='lib32-openssl-1.0' +PKG_BIN32_ARCH='32' +PKG_BIN32_DEPS="$PKG_L10N_ID $PKG_DATA_ID glibc libstdc++ glx openal" +PKG_BIN32_DEPS_ARCH='lib32-openssl-1.0' +# Easier upgrade from packages generated with pre-20180926.2 scripts +PKG_BIN32_PROVIDE='icewind-dale-enhanced-edition' +# Keep compatibility with old archives +PKG_BIN32_DEPS_GOG_OLD0="$PKG_BIN32_DEPS json" + +PKG_BIN64_ARCH='64' +PKG_BIN64_DEPS="$PKG_BIN32_DEPS" +PKG_BIN64_DEPS_ARCH="$PKG_BIN32_DEPS_ARCH" # Easier upgrade from packages generated with pre-20180926.2 scripts -PKG_BIN_PROVIDE='icewind-dale-enhanced-edition' +PKG_BIN64_PROVIDE='icewind-dale-enhanced-edition' # Load common functions @@ -125,17 +144,22 @@ if [ -z "$PLAYIT_LIB2" ]; then fi . "$PLAYIT_LIB2" +# Set pakcages list dependending on source archive +use_archive_specific_value 'PACKAGES_LIST' +set_temp_directories $PACKAGES_LIST + # Try to load icons archive ARCHIVE_MAIN="$ARCHIVE" archive_set 'ARCHIVE_ICONS' 'ARCHIVE_OPTIONAL_ICONS' ARCHIVE="$ARCHIVE_MAIN" -# Use libSSL 1.0.0 32-bit archive (Debian packages only) +# Use libSSL 1.0.0 archives (Debian packages only) if [ "$OPTION_PACKAGE" = 'deb' ]; then ARCHIVE_MAIN="$ARCHIVE" archive_set 'ARCHIVE_LIBSSL32' 'ARCHIVE_OPTIONAL_LIBSSL32' + archive_set 'ARCHIVE_LIBSSL64' 'ARCHIVE_OPTIONAL_LIBSSL64' ARCHIVE="$ARCHIVE_MAIN" fi @@ -158,22 +182,37 @@ else fi rm --recursive "$PLAYIT_WORKDIR/gamedata" -# Include libSSL 1.0.0 32-bit (Debian packages only) +# Include libSSL 1.0.0 (Debian packages only) if [ "$ARCHIVE_LIBSSL32" ]; then ( ARCHIVE='ARCHIVE_LIBSSL32' extract_data_from "$ARCHIVE_LIBSSL32" ) - mkdir --parents "${PKG_BIN_PATH}${PATH_GAME}/$APP_MAIN_LIBS" - mv "$PLAYIT_WORKDIR/gamedata"/* "${PKG_BIN_PATH}${PATH_GAME}/$APP_MAIN_LIBS" + mkdir --parents "${PKG_BIN32_PATH}${PATH_GAME}/$APP_MAIN_LIBS" + mv "$PLAYIT_WORKDIR/gamedata"/* "${PKG_BIN32_PATH}${PATH_GAME}/$APP_MAIN_LIBS" + rm --recursive "$PLAYIT_WORKDIR/gamedata" +fi +if [ "$ARCHIVE_LIBSSL64" ]; then + ( + ARCHIVE='ARCHIVE_LIBSSL64' + extract_data_from "$ARCHIVE_LIBSSL64" + ) + mkdir --parents "${PKG_BIN64_PATH}${PATH_GAME}/$APP_MAIN_LIBS" + mv "$PLAYIT_WORKDIR/gamedata"/* "${PKG_BIN64_PATH}${PATH_GAME}/$APP_MAIN_LIBS" rm --recursive "$PLAYIT_WORKDIR/gamedata" fi # Write launchers -PKG='PKG_BIN' +PKG='PKG_BIN32' write_launcher 'APP_MAIN' +case "$ARCHIVE" in + ('ARCHIVE_GOG') + PKG='PKG_BIN64' + write_launcher 'APP_MAIN' + ;; +esac # Build package @@ -206,7 +245,12 @@ case "$ARCHIVE" in esac ;; esac -write_metadata 'PKG_BIN' +write_metadata 'PKG_BIN32' +case "$ARCHIVE" in + ('ARCHIVE_GOG') + write_metadata 'PKG_BIN64' + ;; +esac write_metadata 'PKG_L10N' 'PKG_DATA' build_pkg -- GitLab From 32296d269385395adabc621836f6e98708827ff0 Mon Sep 17 00:00:00 2001 From: vv221 Date: Wed, 26 Sep 2018 18:08:59 +0200 Subject: [PATCH 4/6] =?UTF-8?q?Icewind=20Dale=20-=20Enhanced=20Edition=20?= =?UTF-8?q?=E2=80=94=20Include=20missing=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- play.it-2/games/play-icewind-dale-1-enhanced-edition.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh b/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh index 81865cc1..64b5a1ac 100755 --- a/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh +++ b/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh @@ -34,7 +34,7 @@ set -o errexit # send your bug reports to vv221@dotslashplay.it ### -script_version=20180926.3 +script_version=20180926.4 # Set game-specific variables @@ -78,7 +78,7 @@ ARCHIVE_GAME_L10N_PATH='data/noarch/game' ARCHIVE_GAME_L10N_FILES='lang' ARCHIVE_GAME_DATA_PATH='data/noarch/game' -ARCHIVE_GAME_DATA_FILES='data movies music scripts chitin.key' +ARCHIVE_GAME_DATA_FILES='chitin.key engine.lua data movies music scripts' ARCHIVE_ICONS_PATH='.' ARCHIVE_ICONS_FILES='16x16 32x32 48x48 64x64 128x128 256x256' -- GitLab From fd37aac8bcd27ea825010897c38e57c6516eebbd Mon Sep 17 00:00:00 2001 From: vv221 Date: Wed, 26 Sep 2018 18:22:30 +0200 Subject: [PATCH 5/6] =?UTF-8?q?Icewind=20Dale=20-=20Enhanced=20Edition=20?= =?UTF-8?q?=E2=80=94=20New=20archive?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../play-icewind-dale-1-enhanced-edition.sh | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh b/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh index 64b5a1ac..827ff8d7 100755 --- a/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh +++ b/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh @@ -34,20 +34,26 @@ set -o errexit # send your bug reports to vv221@dotslashplay.it ### -script_version=20180926.4 +script_version=20180926.5 # Set game-specific variables GAME_ID='icewind-dale-1-enhanced-edition' GAME_NAME='Icewind Dale - Enhanced Edition' -ARCHIVE_GOG='icewind_dale_enhanced_edition_en_2_5_16_3_20626.sh' +ARCHIVE_GOG='icewind_dale_enhanced_edition_en_2_5_17_23121.sh' ARCHIVE_GOG_URL='https://www.gog.com/game/icewind_dale_enhanced_edition' -ARCHIVE_GOG_MD5='f237e9506f046862e8d1c2d21c8fd588' +ARCHIVE_GOG_MD5='bdfcd244568916123c243fb95de1d08b' ARCHIVE_GOG_SIZE='2900000' -ARCHIVE_GOG_VERSION='2.5.16.3-gog20626' +ARCHIVE_GOG_VERSION='2.5.17.0-gog23121' ARCHIVE_GOG_TYPE='mojosetup' +ARCHIVE_GOG_OLD1='icewind_dale_enhanced_edition_en_2_5_16_3_20626.sh' +ARCHIVE_GOG_OLD1_MD5='f237e9506f046862e8d1c2d21c8fd588' +ARCHIVE_GOG_OLD1_SIZE='2900000' +ARCHIVE_GOG_OLD1_VERSION='2.5.16.3-gog20626' +ARCHIVE_GOG_OLD1_TYPE='mojosetup' + ARCHIVE_GOG_OLD0='gog_icewind_dale_enhanced_edition_2.1.0.5.sh' ARCHIVE_GOG_OLD0_MD5='fc7244f4793eec365b8ac41d91a4edbb' ARCHIVE_GOG_OLD0_SIZE='2900000' @@ -208,7 +214,8 @@ fi PKG='PKG_BIN32' write_launcher 'APP_MAIN' case "$ARCHIVE" in - ('ARCHIVE_GOG') + ('ARCHIVE_GOG_OLD0');; + (*) PKG='PKG_BIN64' write_launcher 'APP_MAIN' ;; @@ -247,7 +254,8 @@ case "$ARCHIVE" in esac write_metadata 'PKG_BIN32' case "$ARCHIVE" in - ('ARCHIVE_GOG') + ('ARCHIVE_GOG_OLD0');; + (*) write_metadata 'PKG_BIN64' ;; esac -- GitLab From 47cba61d3f6b4c85e8fc026a91226a40e4127aef Mon Sep 17 00:00:00 2001 From: vv221 Date: Sat, 29 Sep 2018 15:32:56 +0200 Subject: [PATCH 6/6] =?UTF-8?q?Icewind=20Dale=20-=20Enhanced=20Edition=20?= =?UTF-8?q?=E2=80=94=20Fix=20handling=20of=20libjson=20for=20old=20version?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../play-icewind-dale-1-enhanced-edition.sh | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh b/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh index 827ff8d7..4be12b65 100755 --- a/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh +++ b/play.it-2/games/play-icewind-dale-1-enhanced-edition.sh @@ -34,7 +34,7 @@ set -o errexit # send your bug reports to vv221@dotslashplay.it ### -script_version=20180926.5 +script_version=20180929.1 # Set game-specific variables @@ -223,12 +223,14 @@ esac # Build package +use_archive_specific_value 'PKG_BIN32_DEPS' case "$ARCHIVE" in ('ARCHIVE_GOG_OLD0') case "$OPTION_PACKAGE" in ('arch') cat > "$postinst" <<- EOF if [ ! -e /usr/lib32/libjson.so.0 ] && [ -e /usr/lib32/libjson-c.so ] ; then + mkdir --parents "$PATH_GAME/$APP_MAIN_LIBS" ln --symbolic /usr/lib32/libjson-c.so "$PATH_GAME/$APP_MAIN_LIBS/libjson.so.0" fi EOF @@ -236,20 +238,26 @@ case "$ARCHIVE" in ('deb') cat > "$postinst" <<- EOF if [ ! -e /lib/i386-linux-gnu/libjson.so.0 ]; then - mdir --parents "$PATH_GAME/$APP_MAIN_LIBS" + mkdir --parents "$PATH_GAME/$APP_MAIN_LIBS" for file in\ libjson-c.so\ libjson-c.so.2\ - libjson-c.so.3\ + libjson-c.so.3 do - if [ -e "/lib/i386-linux-gnu/$file" ] ; then - ln --symbolic "/lib/i386-linux-gnu/$file" "$PATH_GAME/$APP_MAIN_LIBS/libjson.so.0" - break - fi + if [ -e "/lib/i386-linux-gnu/\$file" ] ; then + ln --symbolic "/lib/i386-linux-gnu/\$file" "$PATH_GAME/$APP_MAIN_LIBS/libjson.so.0" + break + fi + done fi EOF ;; esac + cat > "$prerm" <<- EOF + if [ -e "$PATH_GAME/$APP_MAIN_LIBS/libjson.so.0" ]; then + rm "$PATH_GAME/$APP_MAIN_LIBS/libjson.so.0" + fi + EOF ;; esac write_metadata 'PKG_BIN32' -- GitLab