for d in $repos; do
p="${d%dir}"
f="`repoflags "$d"`"
- # if we have the dir, always keep it
- if [ -d "$d" ]; then
- msg "Repository $d enabled because it already exists"
- $ECHO "$d"
+ # if we have .no file, skip
+ if [ -f "$d.no" ]; then
+ msg "Repository $d disabled by a .no file, delete $d.no to enable"
continue
fi
# if .yes file exists, always keep it
$ECHO "$d"
continue
fi
- # if we have .no file, skip
- if [ -f "$d.no" ]; then
- msg "Repository $d disabled by a .no file, delete $d.no to enable"
+ # remove broken clones so they don't mess up stuff
+ if [ x"$d" != x"." ] && [ -d "$d" ] && ! [ -d "$d/.git" ]; then
+ msg "$d exists but has no .git subdir. Probably a broken clone. Deleting."
+ verbose rm -rf "$d"
+ continue
+ fi
+ # if we have the dir, always keep it
+ if [ -d "$d" ]; then
+ msg "Repository $d enabled because it already exists"
+ $ECHO "$d"
continue
fi
# if we have matching pk3, skip
location=current
oldbase=$base
oldpushbase=$pushbase
+ # transition old URLs
+ if [ x"$base" = x"ssh://xonotic@git.xonotic.org/" ]; then
+ base=ssh://xonotic@push.git.xonotic.org/
+ fi
+ if [ x"$pushbase" = x"ssh://xonotic@git.xonotic.org/" ]; then
+ pushbase=ssh://xonotic@push.git.xonotic.org/
+ fi
while :; do
if [ x"$1" = x"-N" ]; then
allow_pull=false
if [ x"$USE_GDB" = x"yes" ]; then
set -- gdb --args "$@"
- elif [ x"$USE_GDB" != x"no" ] && which gdb >/dev/null 2>&1; then
+ elif [ x"$USE_GDB" = x"core" ] && which gdb >/dev/null 2>&1; then
set -- gdb --batch -x savecore.gdb --args "$@"
elif which catchsegv >/dev/null 2>&1; then
set -- catchsegv "$@"
rm -f Xonotic/key_15.d0pk
{
verbose cd Xonotic/mapping
- 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
+ verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114.tar.bz2
+ verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114-win32-7z.exe
for X in *-7z.exe; do
7za x "$X"
rm -f "$X"
verbose "$SELF" update-maps
;;
release-qc)
- verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+ verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
;;
release-buildpk3-transform-raw)
verbose export jpeg_qual_rgb=97
verbose export jpeg_qual_a=99
verbose export do_dds=false
- verbose export do_ogg=false
+ verbose export do_ogg=true
+ verbose export ogg_ogg=false
verbose export del_src=true
find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
verbose export do_dds=true
verbose export dds_flags=
verbose export do_ogg=true
+ verbose export ogg_ogg=false
verbose export del_src=true
find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
release_timereport "processed data"
verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
release_timereport "transformed data"
+ find . -type f -size +4k | verbose "$d0"/misc/tools/symlink-deduplicate.sh
+ release_timereport "deduplicated data"
verbose mkzipr "../../$dst" *
release_timereport "zipped data"
verbose cd ../..