X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=fc966598fc79f6f975f306999a8e6c5ae0f7b008;hp=a1164dc792c7101679e4f8961554dec3db34fc82;hb=cdd9cdce4dfe30107a6b857fefc67a5629497aa1;hpb=097022097f40ca485b4b7b96a770ca5606aff0af diff --git a/all b/all index a1164dc7..fc966598 100755 --- a/all +++ b/all @@ -1035,7 +1035,7 @@ case "$cmd" in fi if [ -z "$MAKEFLAGS" ]; then if [ -f /proc/cpuinfo ]; then - ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0)) + ncpus=$((`grep -c '^processor :' /proc/cpuinfo || true`+0)) if [ $ncpus -gt 1 ]; then MAKEFLAGS=-j$ncpus fi @@ -1052,13 +1052,13 @@ case "$cmd" in msg "~~~~~~~~~~ COMPILER ~~~~~~~~~~" msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" msg "~~~~~~~~~~~~~~_...._~~~~~~~~~~" - msg "~~~~~~~~~~~,-' . \\\`-._~~~~~~" + msg "~~~~~~~~~~~,-' \\\`-._~~~~~~" msg "~~~~~~~~~~/ --. >< \\~~~~~" msg "~~~~~~~~~/ (*)> -<: \\~~~~" msg "~~~~~~~~~( ^~-' (*) )~~~~" - msg "~~~~~~~~~\\ . . ^+-_/ |~~~~" - msg "~~~~~~~~~~\\ .' {vvv} |~~~~" - msg "~~~~~~~~~~,\\ ' , {^^^},/~~~~~" + msg "~~~~~~~~~\\ ^+-_/ |~~~~" + msg "~~~~~~~~~~\\ {vvv} |~~~~" + msg "~~~~~~~~~~,\\ , {^^^},/~~~~~" msg "~~~~~~~~,/ \`---.....-'~~W~~~~" msg "~~~~~~,/ \\_____/_\\_W~~/~~~~~" msg "~~~~~/ /~~~\\__/~~~~~~" @@ -1668,8 +1668,8 @@ case "$cmd" in rm -f Xonotic/key_15.d0pk { verbose cd Xonotic/mapping - verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701.tar.bz2 - verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701-win32-7z.exe + verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819.tar.bz2 + verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819-win32-7z.exe for X in *-7z.exe; do 7za x "$X" rm -f "$X" @@ -1887,7 +1887,7 @@ case "$cmd" in versionstr="$versionstr$RELEASETYPE" ;; esac - if [ $gv -lt 900 ]; then + if [ $gv -lt 9900 ]; then # pre-1.0: compatible with any other pre-1.0 verbose sed " s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;