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

fix reg readkey and messages

Browse Source
This commit is contained in:
GenZmeY 2022-02-14 03:35:07 +03:00
parent bfdf98db57
commit d61325377d
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
builder
View File

@ -26,9 +26,10 @@ trap cleanup SIGINT SIGTERM ERR EXIT
function reg_readkey () # $1: path, $2: key function reg_readkey () # $1: path, $2: key
{ {
cygpath -u "$( cygpath -u "$(
reg query "$1" //v "$2" | \ reg query "$1" //v "$2" | \
grep -F "$2" | \ grep -F "$2" | \
awk '{ $1=$2=""; print $0 }')" awk '{ $1=$2=""; print $0 }' | \
sed -r 's|^\s*(.+)\s*|\1|g')"
} }
# Whoami # Whoami
@ -353,8 +354,6 @@ function compile ()
local StripSourceArg="" local StripSourceArg=""
local PID="" local PID=""
msg "compilation"
read_build_settings read_build_settings
if ! command -v multini &> /dev/null; then if ! command -v multini &> /dev/null; then
@ -391,17 +390,24 @@ function compile ()
if is_true "$StripSource"; then StripSourceArg="-stripsource"; fi if is_true "$StripSource"; then StripSourceArg="-stripsource"; fi
msg "compilation"
if is_true "$ArgWarnings"; then if is_true "$ArgWarnings"; then
CMD //C "$(cygpath -w "$KFEditor") make $StripSourceArg -useunpublished" CMD //C "$(cygpath -w "$KFEditor") make $StripSourceArg -useunpublished"
if ! compiled; then if ! compiled; then
die "compilation failed, details in Launch.log" die "compilation failed, details in Launch.log"
fi fi
msg "successfully compiled"
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
if compiled; then kill "$PID"; break; fi if compiled; then
kill "$PID"
msg "successfully compiled"
break
fi
sleep 1 sleep 1
done done
fi fi
@ -451,7 +457,7 @@ function brew ()
{ {
local PID="" local PID=""
msg "brew" msg "brewing"
read_build_settings read_build_settings
@ -469,12 +475,17 @@ function brew ()
brew_cleanup brew_cleanup
die "brewing failed, details in Launch.log" die "brewing failed, details in Launch.log"
fi fi
msg "successfully brewed"
else else
CMD //C "cd /D $(cygpath -w "$KFWin64") && $(basename "$KFEditor") brewcontent -platform=PC $PackageUpload -useunpublished" & CMD //C "cd /D $(cygpath -w "$KFWin64") && $(basename "$KFEditor") brewcontent -platform=PC $PackageUpload -useunpublished" &
PID="$!" PID="$!"
while ps -p "$PID" &> /dev/null while ps -p "$PID" &> /dev/null
do do
if brewed; then kill "$PID"; break; fi if brewed; then
kill "$PID"
msg "successfully brewed"
break
fi
sleep 1 sleep 1
done done
fi fi
@ -487,7 +498,7 @@ function brew ()
function brew_manual () function brew_manual ()
{ {
msg "manual brew" msg "manual brewing"
read_build_settings read_build_settings