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`
(
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
}
continue
fi
- rm -rf ~/.xonotic
- mkdir -p ~/.xonotic
+ rm -rf ~/.xonotic/data
+ mkdir -p ~/.xonotic/data
(
cd ../..
if [ -n "$DISPLAY" ]; then
;;
esac
fi
- ) >~/.xonotic/autoscreenshot.log 2>&1
- if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
- if [ -n "$IRCSPAM" ]; then
- #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
- ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
- fi
- return 1
- fi
- mv ~/.xonotic/autoscreenshot.log "$M-$blobhash"/ || true
- if [ -n "$IRCSPAM" ]; then
- #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
- ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
+ ) 2>&1 | tee ~/.xonotic/data/autoscreenshot.log
+ good=false
+ if mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
+ ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > ~/.xonotic/data/"$M.ircss"
+ else
+ mkdir "$M-$blobhash"
+ ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > ~/.xonotic/data/"$M.ircss"
fi
+ 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
}