/ld27

To get this branch, use:
bzr branch /bzr/ld27

« back to all changes in this revision

Viewing changes to andbuild.sh

  • Committer: Josh C
  • Date: 2014-07-05 00:04:06 UTC
  • Revision ID: josh@9ix.org-20140705000406-9h8qk5f0j6oz0xo3
try more gracefully handling different "am" versions

Show diffs side-by-side

added added

removed removed

andbuild.sh
30
30
bzr revert --no-backup version.lua
31
31
 
32
32
#zip deploy/decimaze.love inspect.lua
33
 
grep 'LOVEBIRD = true' main.lua && zip deploy/decimaze.love lovebird.lua
 
33
grep '^[^-]*require .lovebird.' main.lua && zip deploy/decimaze.love lovebird.lua
34
34
 
35
35
 
36
36
if [ $DEV ]; then
37
37
    adb push deploy/decimaze.love /sdcard/Download/
38
 
    adb shell "am start -S -n org.love2d.android/.GameActivity -d file:///sdcard/Download/decimaze.love || am start -n org.love2d.android/.GameActivity -d file:///sdcard/Download/decimaze.love"
 
38
    if adb shell am |grep -- -S; then DASH_S=-S ; fi
 
39
    adb shell am start $DASH_S -n org.love2d.android/.GameActivity -d file:///sdcard/Download/decimaze.love
39
40
    exit 0
40
41
fi
41
42
 
 
43
echo ERROR: not ready for deploying the package yet
 
44
exit 1
 
45
 
42
46
cp deploy/decimaze.love $LAS2/assets/game.love
43
47
 
44
48
#mv $LAS2/AndroidManifest.xml /tmp/