From: Rudolf Polzer Date: Tue, 2 Oct 2012 08:24:43 +0000 (+0200) Subject: merge changes to some scripts done for function2012 X-Git-Tag: xonotic-v0.7.0~36 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=07a444eba1418c90f1f2233389e6cdf5d013b9f5;p=xonotic%2Fxonotic.git merge changes to some scripts done for function2012 --- diff --git a/misc/tools/demopacker.sh b/misc/tools/demopacker.sh index 72563172..44f91b1e 100755 --- a/misc/tools/demopacker.sh +++ b/misc/tools/demopacker.sh @@ -1,7 +1,6 @@ #!/bin/sh xonotic=$1; shift -strip=$1; shift demo=$1; shift # rest: command line options to use @@ -9,7 +8,7 @@ demobase=${demo##*/} cp "$demo" data/"$demobase" -strace -qo strace.txt -f -e trace=open ./all run -nohome -readonly -forceqmenu -window "$@" -demo "$demobase" +USE_RLWRAP=no strace -qo strace.txt -f -e trace=open ./all run -nohome -readonly -forceqmenu -window "$@" -demo "$demobase" allfiles() { @@ -66,8 +65,8 @@ done export do_jpeg=true export dp_jpeg_if_not_dds=false -export jpeg_qual_rgb=80 -export jpeg_qual_a=95 +export jpeg_qual_rgb=70 +export jpeg_qual_a=90 export do_dds=false export do_ogg=true export ogg_ogg=true @@ -82,5 +81,4 @@ echo "-xonotic -nohome -readonly -forceqmenu +bind ESCAPE quit $* -demo $demobas rm output.pk3 ( cd output && 7za a -tzip -mx=9 ../output.pk3 . ) cp "$xonotic" output.exe -$strip --strip-unneeded output.exe cat output.pk3 >> output.exe diff --git a/misc/tools/midi2cfg-ng.pl b/misc/tools/midi2cfg-ng.pl index 7b9fcd22..4fcf9760 100755 --- a/misc/tools/midi2cfg-ng.pl +++ b/misc/tools/midi2cfg-ng.pl @@ -377,6 +377,10 @@ sub busybot_cmd_bot_execute($$@) { $commands .= sprintf "%s\n", buildstring @{$_}[1..@$_-1]; } + else + { + warn "Invalid command: @$_"; + } } return 1;