Skip to content

Commit

Permalink
Followup for previus commit, fix new version usage.
Browse files Browse the repository at this point in the history
  • Loading branch information
burner1024 committed Aug 23, 2024
1 parent a2015b4 commit 461d4b5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions extra/inno/inno.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
#define backup_dir "backup\" + basename
#define mods_dir "{app}\mods"
; build process shenanigans, see inno.sh
#define vversion "v0"
#define version "v0"

[Setup]
AppName=Fallout 2 Unofficial Patch
AppVerName=Fallout 2 Unofficial Patch 1.02.{#vversion}
AppVerName=Fallout 2 Unofficial Patch 1.02.{#version}
AppId=Fallout 2 Unofficial Patch
AppPublisher=BGforge
AppPublisherURL=https://bgforge.net
AppSupportURL=https://forums.bgforge.net/viewforum.php?f=34
AppUpdatesURL=https://github.com/BGforgeNet/Fallout2_Unofficial_Patch
VersionInfoTextVersion=1.02.31{#vversion}
VersionInfoTextVersion=1.02.{#version}
DefaultDirName=C:\Games\Fallout2
AppendDefaultDirName=no
DisableProgramGroupPage=yes
OutputBaseFilename={#basename}_{#vversion}
OutputBaseFilename={#basename}_v{#version}
Compression=lzma
DirExistsWarning=no
Uninstallable=no
Expand Down
2 changes: 1 addition & 1 deletion extra/package/inno.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ chmod 0777 Output
# shellcheck disable=SC2154 # from env.sh
rm -f "$release_dir"/{upu-install.sh,upu-install.command}
# shellcheck disable=SC2154 # from env.sh
sed -i "s|define vversion .*|define vversion \"${vversion}\"|" "$install_iss"
sed -i "s|define version .*|define version \"${version}\"|" "$install_iss"

rm -rf release translations
cp -r "$release_dir" ./
Expand Down
2 changes: 1 addition & 1 deletion extra/package/sfall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ crudini --merge "$release_ini" <"$custom_ini"
# set version string
sed -i "s|^;VersionString=|VersionString=|" "$release_ini"
# shellcheck disable=SC2154 # from env.sh
crudini --set "$release_ini" "Misc" "VersionString" "FALLOUT II 1.02.${vversion}"
crudini --set "$release_ini" "Misc" "VersionString" "FALLOUT II 1.02.${version}"
# crudini adds spaces arouns the values, need to remove them
sed -i "s|^\([[:alnum:]]\+\) = |\1=|" "$release_ini"
# for windows users
Expand Down
2 changes: 1 addition & 1 deletion extra/package/translations.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ for lang in $(ls $lang_dir); do
patchinf="$lang_dir/$lang/dialog/patchinf.msg"
# display current version
# shellcheck disable=SC2154 # from package.sh
sed -i "s|1\.02\.31u[0-9]*\.|1.02.${vversion}.|" "$patchinf"
sed -i "s|1\.02\.31u[0-9]*\.|1.02.${version}.|" "$patchinf"
# if the string is untranslated, still show correct language
lang_name="${lang^}"
sed -i "s|English|$lang_name|" "$patchinf"
Expand Down

0 comments on commit 461d4b5

Please sign in to comment.