git checkout -f "$commithash"
if [ -n "$IRCSPAM" ]; then
- pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM
+ pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM || true
fi
t0=`date +%s`
(
- cd maps
- sz=`grep '^size ' "$M.mapinfo" 2>/dev/null || true`
- if [ -n "$sz" ]; then
- minimap_override="-minimap + -minmax ${sz#size }"
- else
- minimap_override=
- fi
- ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $minimap_override $build_override > "$M.log" 2>&1
+ cd ../..
+ misc/tools/xonotic-map-compiler-optionsfile "data/xonotic-data.pk3dir/maps/$M" $build_override > "$M.log" 2>&1
)
status=$?
if ! [ -f "maps/$M.bsp" ]; then
rsync -vaSHP "$M-$blobhash.pk3" "$M-full-$blobhash.pk3" "$url_ssh"
rsync -vaSHP "$M.pk3" "$M-full.pk3" "$url_ssh""latest/"
if [ -n "$IRCSPAM" ]; then
- $IRCSPAM < "maps/$M.irc"
+ $IRCSPAM < "maps/$M.irc" || true
+ fi
+ if [ -n "$BUILD_ONE" ]; then
+ exit
fi
}
continue
fi
- rm -rf ~/.xonotic
- mkdir -p ~/.xonotic
+ rm -rf ~/.xonotic/data
+ mkdir -p ~/.xonotic/data
(
cd ../..
if [ -n "$DISPLAY" ]; then
;;
esac
fi
- ) 2>&1 | tee ~/.xonotic/autoscreenshot.log
+ ) 2>&1 | tee ~/.xonotic/data/autoscreenshot.log
good=false
if mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
- ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
+ ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > ~/.xonotic/data/"$M.ircss"
else
mkdir "$M-$blobhash"
- ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
+ ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > ~/.xonotic/data/"$M.ircss"
fi
- mv "maps/$M.ircss" "$M-$blobhash"/
- mv ~/.xonotic/autoscreenshot.log "$M-$blobhash"/ || mkdir -p "$M-$blobhash"
+ mv ~/.xonotic/data/"$M.ircss" "$M-$blobhash"/
+ mv ~/.xonotic/data/autoscreenshot.log "$M-$blobhash"/
chmod 1777 "$M-$blobhash"
ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
rsync -vaSHP "$M-$blobhash" "$url_ssh"
rsync -vaSHP "$M" "$url_ssh""latest/"
if [ -n "$IRCSPAM" ]; then
- $IRCSPAM < "maps/$M.ircss"
+ $IRCSPAM < "$M-$blobhash/$M.ircss" || true
+ fi
+ if [ -n "$BUILD_ONE" ]; then
+ exit
fi
- return 1
}
getthemap()
runmakeindex
;;
download)
+ if ! which unzip >/dev/null 2>&1; then
+ echo "Cannot find unzip, bailing out"
+ exit 1
+ fi
if ! cd data/xonotic-maps.pk3dir >/dev/null 2>&1; then
echo "data/xonotic-maps.pk3dir does not exist, not downloading"
exit 0