fixes init.sh script (and do not put openlayers in submodule)

[syj.git] / scripts / init.sh

diff --git a/scripts/init.sh b/scripts/init.sh
index bbb8817c0bf07669e94ce0f2487213e10baf69b7..aa9579d4fe329aaeec4b2e4221b98c505ea4c3ab 100755 (executable)
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -2,12 +2,11 @@
 
 git submodule update --init
 
-git submodule -q foreach "
-    if ls -A $PWD/patches/\${name##*/} >/dev/null 2>&1; then
-        git checkout master
-        git am $PWD/patches/\${name##*/}/*
-    fi
-"
+OLDPWD=$PWD
+cd public/prototype
+rake
+cd $OLDPWD
 
 sh scripts/updatezend.sh
+sh scripts/updateopenlayers.sh
 sh scripts/reset.postgres.sh -g