KillingFloor2/KF2-BuildTools
KillingFloor2/KF2-BuildTools
1
0
Fork 0
Code

redo the output of messages and fix the build when stripsource is off

Browse Source
This commit is contained in:
GenZmeY 2023-04-03 02:46:36 +03:00
parent f0bf3e20c7
commit 0ce0136be2
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
builder
View File

@ -128,7 +128,7 @@ function get_latest () # $1: Reponame, $2: filename, $3: output filename
msg "download $2 ($LatestTag)" msg "download $2 ($LatestTag)"
mkdir -p "$(dirname "$3")/" mkdir -p "$(dirname "$3")/"
curl -LJs "$DownloadUrl" -o "$3" curl -LJs "$DownloadUrl" -o "$3"
msg "${GRN}successfully downloaded${DEF}" msg "successfully downloaded" "${GRN}"
} }
function get_latest_multini () # $1: file to save function get_latest_multini () # $1: file to save
@ -169,13 +169,13 @@ function err () # $1: String
fi fi
} }
function msg () # $1: String function msg () # $1: String, $2: Color code (global)
{ {
if ! is_true "$ArgQuiet"; then if ! is_true "$ArgQuiet"; then
if is_true "$ArgDebug"; then if is_true "$ArgDebug"; then
echo -e "${BLU}${1-}${DEF}" >&1 echo -e "${BLU}${2-}${1-}${DEF}" >&1
else else
echo -e "${DEF}${1-}${DEF}" >&1 echo -e "${DEF}${2-}${1-}${DEF}" >&1
fi fi
fi fi
} }
@ -188,7 +188,7 @@ function die () # $1: String, $2: Exit code
function warn () # $1: String function warn () # $1: String
{ {
msg "${YLW}${1-}${DEF}" msg "${1-}" "${YLW}"
} }
function usage () function usage ()
@ -233,7 +233,7 @@ function version ()
Version="(standalone)" Version="(standalone)"
fi fi
msg "${BLD}$ScriptName $Version${DEF}" msg "$ScriptName $Version" "${BLD}"
} }
function cleanup() function cleanup()
@ -460,7 +460,7 @@ Mutators="$(print_list "$AviableMutators" ",")"
# Additional parameters # Additional parameters
Args="" Args=""
EOF EOF
msg "${GRN}$(basename "$MutBuilderConfig") created${DEF}" msg "$(basename "$MutBuilderConfig") created" "${GRN}"
fi fi
if ! [[ -d "$MutPubContent" ]]; then mkdir -p "$MutPubContent"; fi if ! [[ -d "$MutPubContent" ]]; then mkdir -p "$MutPubContent"; fi
@ -469,7 +469,7 @@ EOF
if is_true "$ArgForce" || ! [[ -e "$MutPubContentTitle" ]]; then if is_true "$ArgForce" || ! [[ -e "$MutPubContentTitle" ]]; then
echo "$ProjectName" > "$MutPubContentTitle" echo "$ProjectName" > "$MutPubContentTitle"
msg "${GRN}$(basename "$MutPubContentTitle") created${DEF}" msg "$(basename "$MutPubContentTitle") created" "${GRN}"
fi fi
if is_true "$ArgForce" || ! [[ -e "$MutPubContentDescription" ]]; then if is_true "$ArgForce" || ! [[ -e "$MutPubContentDescription" ]]; then
@ -506,7 +506,7 @@ EOF
} >> "$MutPubContentDescription" } >> "$MutPubContentDescription"
fi fi
msg "${GRN}$(basename "$MutPubContentDescription") created${DEF}" msg "$(basename "$MutPubContentDescription") created" "${GRN}"
fi fi
if is_true "$ArgForce" || [[ "$(preview_extension)" == "None" ]]; then if is_true "$ArgForce" || [[ "$(preview_extension)" == "None" ]]; then
@ -515,7 +515,7 @@ EOF
else else
printf '%b' "$DummyPreviewRaw" > "${MutPubContentPreview}.png" printf '%b' "$DummyPreviewRaw" > "${MutPubContentPreview}.png"
fi fi
msg "${GRN}$(basename "${MutPubContentPreview}.png") created${DEF}" msg "$(basename "${MutPubContentPreview}.png") created" "${GRN}"
fi fi
if is_true "$ArgForce" || ! [[ -e "$MutPubContentTags" ]]; then if is_true "$ArgForce" || ! [[ -e "$MutPubContentTags" ]]; then
@ -531,7 +531,7 @@ EOF
fi fi
echo "$PublicationTags" >> "$MutPubContentTags" echo "$PublicationTags" >> "$MutPubContentTags"
fi fi
msg "${GRN}$(basename "$MutPubContentTags") created${DEF}" msg "$(basename "$MutPubContentTags") created" "${GRN}"
fi fi
} }
@ -725,21 +725,21 @@ function compile ()
msg "compilation" msg "compilation"
if is_true "$ArgHoldEditor"; then if is_true "$ArgHoldEditor"; then
CMD //C "$(cygpath -w "$KFEditor")" make "$StripSourceArg" -useunpublished CMD //C "$(cygpath -w "$KFEditor")" make $StripSourceArg -useunpublished
parse_log "$(find_log)" parse_log "$(find_log)"
if ! compiled; then if ! compiled; then
die "compilation failed" die "compilation failed"
fi fi
msg "${GRN}successfully compiled${DEF}" msg "successfully compiled" "${GRN}"
else else
CMD //C "$(cygpath -w "$KFEditor")" make "$StripSourceArg" -useunpublished & CMD //C "$(cygpath -w "$KFEditor")" make $StripSourceArg -useunpublished &
PID="$!" PID="$!"
while ps -p "$PID" &> /dev/null while ps -p "$PID" &> /dev/null
do do
sleep 1 sleep 1
Logfile="$(find_log)" Logfile="$(find_log)"
if compiled; then if compiled; then
msg "${GRN}successfully compiled${DEF}" msg "successfully compiled" "${GRN}"
msg "wait for the log" msg "wait for the log"
while ! grep -qF 'Log file closed' "$Logfile" while ! grep -qF 'Log file closed' "$Logfile"
@ -869,7 +869,7 @@ function brew ()
pushd "$KFWin64" &> /dev/null pushd "$KFWin64" &> /dev/null
CMD //C "$(basename "$KFEditorPatcher")" CMD //C "$(basename "$KFEditorPatcher")"
popd &> /dev/null popd &> /dev/null
msg "${GRN}successfully patched${DEF}" msg "successfully patched" "${GRN}"
for Package in $PackagePeelzBrew for Package in $PackagePeelzBrew
do do
@ -879,7 +879,7 @@ function brew ()
done done
fi fi
msg "${GRN}successfully brewed${DEF}" msg "successfully brewed" "${GRN}"
rm -f "$KFPublishBrewedPC"/*.tmp rm -f "$KFPublishBrewedPC"/*.tmp
@ -964,7 +964,7 @@ EOF
rm -f "$MutWsInfo" rm -f "$MutWsInfo"
if is_true "$Success"; then if is_true "$Success"; then
msg "${GRN}successfully uploaded to steam workshop${DEF}" msg "successfully uploaded to steam workshop" "${GRN}"
else else
die "upload to steam workshop failed" 2 die "upload to steam workshop failed" 2
fi fi