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

add quotes

Browse Source
This commit is contained in:
GenZmeY 2022-03-20 06:52:08 +03:00
parent 3e9e926a2d
commit 568be87386
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builder
View File

@ -119,7 +119,7 @@ function get_latest () # $1: Reponame, $2: filename, $3: output filename
{ {
local ApiUrl="https://api.github.com/repos/$1/releases/latest" local ApiUrl="https://api.github.com/repos/$1/releases/latest"
local LatestTag="" local LatestTag=""
LatestTag=$(curl --silent "$ApiUrl" | grep -Po '"tag_name": "\K.*?(?=")') LatestTag="$(curl --silent "$ApiUrl" | grep -Po '"tag_name": "\K.*?(?=")')"
local DownloadUrl="https://github.com/$1/releases/download/$LatestTag/$2" local DownloadUrl="https://github.com/$1/releases/download/$LatestTag/$2"
msg "download $2 ($LatestTag)" msg "download $2 ($LatestTag)"
@ -187,7 +187,7 @@ function usage ()
{ {
local HelpMessage="" local HelpMessage=""
HelpMessage=$(cat <<EOF HelpMessage="$(cat <<EOF
${BLD}Usage:${DEF} $0 OPTIONS ${BLD}Usage:${DEF} $0 OPTIONS
Compile, brew, test and upload your kf2 packages to the Steam Workshop. Compile, brew, test and upload your kf2 packages to the Steam Workshop.
@ -213,7 +213,7 @@ ${BLD}Short options can be combined, examples:${DEF}
-wcb compile and brew without closing kf2editor -wcb compile and brew without closing kf2editor
etc... etc...
EOF EOF
) )"
msg "$HelpMessage" msg "$HelpMessage"
} }
@ -366,7 +366,7 @@ EOF
if ! [[ -d "$MutPubContent" ]]; then mkdir -p "$MutPubContent"; fi if ! [[ -d "$MutPubContent" ]]; then mkdir -p "$MutPubContent"; fi
ProjectName=$(basename "$(readlink -e "$MutSource")") ProjectName="$(basename "$(readlink -e "$MutSource")")"
if is_true "$ArgForce" || ! [[ -e "$MutPubContentTitle" ]]; then if is_true "$ArgForce" || ! [[ -e "$MutPubContentTitle" ]]; then
echo "$ProjectName" > "$MutPubContentTitle" echo "$ProjectName" > "$MutPubContentTitle"
@ -388,7 +388,7 @@ EOF
echo "" >> "$MutPubContentDescription" echo "" >> "$MutPubContentDescription"
fi fi
GitRemoteUrl=$(repo_url "$(git config --get remote.origin.url)") GitRemoteUrl="$(repo_url "$(git config --get remote.origin.url)")"
if [[ -n "$GitRemoteUrl" ]]; then if [[ -n "$GitRemoteUrl" ]]; then
{ {
echo "[h1]Sources[/h1]" echo "[h1]Sources[/h1]"
@ -397,7 +397,7 @@ EOF
} >> "$MutPubContentDescription" } >> "$MutPubContentDescription"
fi fi
GitUsername=$(git config --get user.name) GitUsername="$(git config --get user.name)"
if [[ -n "$GitUsername" ]]; then if [[ -n "$GitUsername" ]]; then
{ {
echo "[h1]Author[/h1]" echo "[h1]Author[/h1]"
@ -454,7 +454,7 @@ function merge_package () # $1: What, $2: Where
if is_true "$ArgHoldEditor"; then if is_true "$ArgHoldEditor"; then
CMD //C "cd /D $(cygpath -w "$KFWin64") && $(basename "$KFEditorMergePackages") make $1 $2" CMD //C "cd /D $(cygpath -w "$KFWin64") && $(basename "$KFEditorMergePackages") make $1 $2"
else else
ModificationTime=$(stat -c %y "$KFWin64/$2") ModificationTime="$(stat -c %y "$KFWin64/$2")"
CMD //C "cd /D $(cygpath -w "$KFWin64") && $(basename "$KFEditorMergePackages") make $1 $2" & CMD //C "cd /D $(cygpath -w "$KFWin64") && $(basename "$KFEditorMergePackages") make $1 $2" &
PID="$!" PID="$!"
while ps -p "$PID" &> /dev/null while ps -p "$PID" &> /dev/null
@ -590,7 +590,7 @@ function compile ()
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"
Logfile=$(find "$KFLogs" -printf '%T+ %p\n' | sort -r | head -n1 | cut -f2- -d" ") Logfile="$(find "$KFLogs" -printf '%T+ %p\n' | sort -r | head -n1 | cut -f2- -d" ")"
parse_log "$Logfile" parse_log "$Logfile"
if ! compiled; then if ! compiled; then
die "compilation failed" die "compilation failed"
@ -602,7 +602,7 @@ function compile ()
while ps -p "$PID" &> /dev/null while ps -p "$PID" &> /dev/null
do do
sleep 1 sleep 1
Logfile=$(find "$KFLogs" -printf '%T+ %p\n' | sort -r | head -n1 | cut -f2- -d" ") Logfile="$(find "$KFLogs" -printf '%T+ %p\n' | sort -r | head -n1 | cut -f2- -d" ")"
if compiled; then if compiled; then
msg "${GRN}successfully compiled${DEF}" msg "${GRN}successfully compiled${DEF}"
@ -776,7 +776,7 @@ function upload ()
find "$KFPublish" -type d -empty -delete find "$KFPublish" -type d -empty -delete
PreparedWsDir=$(mktemp -d -u -p "$KFDoc") PreparedWsDir="$(mktemp -d -u -p "$KFDoc")"
cat > "$MutWsInfo" <<EOF cat > "$MutWsInfo" <<EOF
\$Description "$(cat "$MutPubContentDescription")" \$Description "$(cat "$MutPubContentDescription")"