# no merge-base? upstream did filter-branch
if [ -n "$r_base" ]; then
# otherwise, check if the two histories are "similar"
- r_l_me=`git log --pretty="format:%s" "$r_other".."$r_me" | grep -v "^Merged" | sort -u`
- r_l_other=`git log --pretty="format:%s" "$r_me".."$r_other" | grep -v "^Merged" | sort -u`
+ r_l_me=`git log --pretty="format:%s" "$r_other".."$r_me" | grep -v "^Merge" | sort -u`
+ r_l_other=`git log --pretty="format:%s" "$r_me".."$r_other" | grep -v "^Merge" | sort -u`
# heuristics: upstream rebase/filter-branch if more than 50% of the commits of one of the sides are in the other too
r_lc_me=`echo "$r_l_me" | wc -l`
r_lc_together=`{ echo "$r_l_me"; echo "$r_l_other"; } | sort -u | wc -l`
r_lc_same=$(($r_lc_me + $r_lc_other - $r_lc_together))
- if [ $(( $r_lc_same * 2 )) -le $(( $r_lc_me )) ] && [ $(( $r_lc_same * 2 )) -le $(( $r_lc_other )) ]; then
- if yesno "Probable upstream rebase detected, automatically fix?" 'git log --oneline --graph --left-right "$r_l_other".."$r_l_me"'; then
+ if [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_me )) ] || [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_other )) ]; then
+ if yesno "Probable upstream rebase detected, automatically fix?" 'git log --oneline --graph --date-order --left-right "$r_other"..."$r_me"'; then
git reset --hard "$r_me"
git pull --rebase
return 1
mkdir data fteqcc
tar xvf -
rm -rf misc/builddeps
- mv misc/buildfiles/win32/* .
- mv misc/buildfiles/win64/* .
- mv misc/buildfiles/osx/* .
+ mv misc/buildfiles/win32/* . || true
+ mv misc/buildfiles/win64/* . || true
+ mv misc/buildfiles/osx/* . || true
rm -rf misc/buildfiles
}
;;
;;
release-engine)
"$SELF" release-engine-win32 &
- "$SELF" release-engine-win64 &
+ # "$SELF" release-engine-win64 &
"$SELF" release-engine-osx &
"$SELF" release-engine-linux32 &
"$SELF" release-engine-linux64 &
;;
release-maps)
"$SELF" update-maps
- for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
- if [ -f "$X" ]; then
- cd Xonotic/data/xonotic-maps.pk3dir
- unzip ../../../"$X"
- cd ../../..
- fi
- done
;;
release-finish)
# version numnber and stuff like that
cp "$src"/csprogs.dat Xonotic/temp/
cp "$src"/menu.dat Xonotic/temp/
fi
+ if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
+ for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+ if [ -f "$X" ]; then
+ (
+ cd Xonotic/data/xonotic-maps.pk3dir
+ unzip ../../../"$X"
+ )
+ fi
+ done
+ fi
"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
cd Xonotic/temp
zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
done
;;
release-pack)
- "$SELF" release-buildpk3s data/font-dejavu.pk3dir raw ''
+ "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw ''
"$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low'
"$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low'
"$SELF" release-buildpk3s data/xonotic-music.pk3dir normal '' raw '-raw' low '-low'
;;
release)
"$SELF" release-prepare
- "$SELF" release-engine
"$SELF" release-maps
"$SELF" release-finish
+ "$SELF" release-engine
"$SELF" release-qc
"$SELF" release-pack
;;