case $key in
big-city)
copy_tables sect
- sed_i '/"c" .* norm/d;/^#.*"c" .* cana/s/^#/ /' sandbox/etc/empire/sect.config
+ sed_i '/"c" .* "capital"/d;/^#.*"c" .* "city"/s/^#/ /;/"c" .* norm/d;/^#.*"c" .* cana/s/^#/ /' sandbox/etc/empire/sect.config
;;
+ trade-ship)
+ copy_tables ship
+ sed_i '/"ts trade ship"//^#/ /' sandbox/etc/empire/ship.config
esac
done
echo "custom_tables \"`cd sandbox/etc/empire && echo *.config`\"" >>$econfig
cmp_out1()
{
- local i=$1 exp="${2-$testdir/${1##*/}}"
+ local i=$1 master="${2-$testdir/${1##*/}}"
+ local exp="$master"
local act="sandbox/$i"
local nrm="sandbox/normalized-${i##*/}"
[ ! -e "$act" ] && return
exp=/dev/null
;;
- *.status) exp=sandbox/ok.status; echo 0 >sandbox/ok.status ;;
- *) exp=/dev/null ;;
esac
fi
elif [ "$EMPIRE_CHECK_ACCEPT" ]
then
echo "$i CHANGED"
- cp "$nrm" "$exp"
+ cp "$nrm" "$master"
else
failed=y
echo "$i FAIL"