Merge branch 'tof-4-2' into 'master'

Tanks of freedom: fix sed problem

Fix sed error

"sed: -e expression #1, char 152: unknown option to `s'"

See merge request !1305
This commit is contained in:
Daniel Martí 2016-03-24 15:53:23 +00:00
commit 06231b7205

View file

@ -263,7 +263,7 @@ Build:0.4.2-beta,12
bash -O extglob -c "mv !(tof) tof" && \
cp tof/buildConfig/engine_android.cfg tof/engine.cfg && \
cp tof/buildConfig/export_android.cfg.dist tof/export.cfg && \
sed -i 's,\(package/unique_name=\).*$,\1"in.p1x.tanks_of_freedom",;s,\(version/code\).*$,\1=$$VERCODE$$,;s,\(version/name=\).*$,\1"$$VERSION$$",;s/\(package/signed\).*$/\1=false/' tof/export.cfg && \
sed -i 's,\(package/unique_name=\).*$,\1"in.p1x.tanks_of_freedom",;s,\(version/code\).*$,\1=$$VERCODE$$,;s,\(version/name=\).*$,\1"$$VERSION$$",;s,\(package/signed\).*$,\1=false,' tof/export.cfg && \
cp -R $$Godot$$ godot
target=android-19
scandelete=godot/drivers/builtin_openssl2/crypto/pkcs7/p7,godot/platform/flash