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

[syj.git] / scripts / updatezend.sh

diff --git a/scripts/updatezend.sh b/scripts/updatezend.sh
index d707812f3fea47f5fa82c4f9dd07477c46cf3de5..90ba32cedd1003571f155d83ee972fa3afe82e6e 100755 (executable)
--- a/scripts/updatezend.sh
+++ b/scripts/updatezend.sh
@@ -6,6 +6,7 @@ if [ -f library/Zend/Version.php ]; then
     php -r "include('library/Zend/Version.php'); exit(Zend_Version::compareVersion(\"$ZEND_VERSION\"));"
     if [ $? -ne 1 ];then
         echo no new version
+        exit
     fi
 fi
 
@@ -13,6 +14,18 @@ echo downloading zend $ZEND_VERSION
 
 wget http://framework.zend.com/releases/ZendFramework-$ZEND_VERSION/ZendFramework-$ZEND_VERSION-minimal.tar.gz
 tar zxf ZendFramework-$ZEND_VERSION-minimal.tar.gz
-rm -rf library/Zend
-mv ZendFramework-$ZEND_VERSION-minimal/library/Zend library/
+if [ -d library/Zend ]; then
+    rm -rf library/Zend/*
+else
+    mkdir -p library/Zend
+fi
+mv ZendFramework-$ZEND_VERSION-minimal/library/Zend/* library/Zend/
 rm -rf ZendFramework-$ZEND_VERSION-minimal ZendFramework-$ZEND_VERSION-minimal.tar.gz
+
+cd library/Zend
+if [ ! -d .git ]; then
+    git init .
+fi
+git add .
+git commit -am "importing Zend $ZEND_VERSION"
+git tag "Zend/$ZEND_VERSION"