1
0

BrewedPC additional content

This commit is contained in:
GenZmeY 2022-09-01 18:48:41 +03:00
parent 55bdd154ba
commit 1ad83de1ac

18
builder
View File

@ -64,6 +64,7 @@ KFLogs="$KFDoc/KFGame/Logs"
MutSource="$(readlink -e "$ScriptDir/..")" MutSource="$(readlink -e "$ScriptDir/..")"
MutConfig="$MutSource/Config" MutConfig="$MutSource/Config"
MutLocalization="$MutSource/Localization" MutLocalization="$MutSource/Localization"
MutBrewedPCAddon="$MutSource/BrewedPC"
MutBuilderConfig="$MutSource/builder.cfg" MutBuilderConfig="$MutSource/builder.cfg"
MutPubContent="$MutSource/PublicationContent" MutPubContent="$MutSource/PublicationContent"
MutPubContentDescription="$MutPubContent/description.txt" MutPubContentDescription="$MutPubContent/description.txt"
@ -692,6 +693,11 @@ function publish_common ()
mkdir -p "$KFPublishConfig" mkdir -p "$KFPublishConfig"
cp -rf "$MutConfig"/* "$KFPublishConfig" cp -rf "$MutConfig"/* "$KFPublishConfig"
fi fi
if [[ -d "$MutBrewedPCAddon" ]]; then
mkdir -p "$KFPublishBrewedPC"
cp -rf "$MutBrewedPCAddon"/* "$KFPublishBrewedPC"
fi
} }
function brewed () # $1: Wait for packages function brewed () # $1: Wait for packages
@ -788,7 +794,6 @@ function brew ()
msg "${GRN}successfully brewed${DEF}" msg "${GRN}successfully brewed${DEF}"
rm -f "$KFPublishBrewedPC"/*.tmp rm -f "$KFPublishBrewedPC"/*.tmp
publish_common
find "$KFPublish" -type d -empty -delete find "$KFPublish" -type d -empty -delete
} }
@ -805,8 +810,6 @@ function publish_unpublished ()
find "$MutSource/$Package" -type f -name '*.upk' -exec cp -f {} "$KFPublishPackages" \; find "$MutSource/$Package" -type f -name '*.upk' -exec cp -f {} "$KFPublishPackages" \;
done done
publish_common
find "$KFPublish" -type d -empty -delete find "$KFPublish" -type d -empty -delete
} }
@ -818,16 +821,18 @@ function upload ()
read_settings read_settings
if ! compiled; then if ! compiled && ! test -d "$MutBrewedPCAddon"; then
die "You must compile packages before uploading. Use --compile option for this." 2 die "You must compile packages before uploading. Use --compile option for this." 2
fi fi
if [[ -d "$KFPublish" ]]; then if [[ -d "$KFPublish" ]]; then
brew_cleanup brew_cleanup
else elif [[ -d "$KFUnpublish" ]]; then
publish_unpublished publish_unpublished
fi fi
publish_common
Preview="${MutPubContentPreview}.$(preview_extension)" Preview="${MutPubContentPreview}.$(preview_extension)"
if ! [[ -e "$Preview" ]]; then if ! [[ -e "$Preview" ]]; then
@ -838,6 +843,9 @@ function upload ()
find "$KFPublish" -type d -empty -delete find "$KFPublish" -type d -empty -delete
# it's a bad idea to use the $KFPublish folder for upload
# because in that case some files won't get uploaded to the workshop for some reason
# so create a temporary folder to get around this
PreparedWsDir="$(mktemp -d -u -p "$KFDoc")" PreparedWsDir="$(mktemp -d -u -p "$KFDoc")"
cat > "$MutWsInfo" <<EOF cat > "$MutWsInfo" <<EOF