Took out debug messages from schemaValidation for ims import.

[atutor.git] / bundle.sh

diff --git a/bundle.sh b/bundle.sh
index 45fb50e..f236bf8 100755 (executable)
--- a/bundle.sh
+++ b/bundle.sh
@@ -8,6 +8,8 @@
 set now = `date +"%Y_%m_%d"`
 set atutor_dir = "ATutor_$now"
 set bundle = "ATutor"
+set svndir = "http://svn.atutor.ca/repos/atutor/trunk/docs/"
+set svnexec = "svn"
 
 echo "\033[1mATutor Bundle Script [for CVS 1.3.1+] \033[0m"
 echo "--------------------"
@@ -43,16 +45,17 @@ if (-e $atutor_dir) then
 endif
 sleep 1
 
-echo "\nCopying docs/ to $atutor_dir"
+echo "\nExporting from SVN/ to $atutor_dir"
 mkdir $atutor_dir
-cp -R docs $atutor_dir/ATutor
+#cp -R docs $atutor_dir/ATutor
+$svnexec --force export $svndir
+mv 'docs' $atutor_dir/ATutor
 sleep 1
 
-echo "\nDumping lang_base"
-rm $atutor_dir/ATutor/install/db/atutor_lang_base.sql
-echo "DROP TABLE lang_base;" > $atutor_dir/ATutor/install/db/atutor_lang_base.sql
-chmod a+rwx dump_lang.php
-wget --output-document=- http://atutor.ca/atutor/translate/dump_lang.php >> $atutor_dir/ATutor/install/db/atutor_lang_base.sql
+echo "\nDumping language_text"
+rm $atutor_dir/ATutor/install/db/atutor_language_text.sql
+echo 'DROP TABLE `language_text`;' > $atutor_dir/ATutor/install/db/atutor_language_text.sql
+wget --output-document=- http://atutor.ca/atutor/translate/dump_lang.php >> $atutor_dir/ATutor/install/db/atutor_language_text.sql
 
 sleep 1
 
@@ -61,40 +64,33 @@ rm -f $atutor_dir/ATutor/include/config.inc.php
 echo -n "<?php /* This file is a placeholder. Do not delete. Use the automated installer. */ ?>" > $atutor_dir/ATutor/include/config.inc.php
 sleep 1
 
-#rm -r $atutor_dir/ATutor/users/admin
+#echo "\nRemoving $atutor_dir/ATutor/themes/clean_blue"
+#rm -r $atutor_dir/ATutor/themes/clean_blue
+#sleep 1
 
-echo "\nRemoving $atutor_dir/ATutor/include/cvs_development.inc.php"
-rm $atutor_dir/ATutor/include/cvs_development.inc.php
-sleep 1
-
-
-echo "\nRemoving $atutor_dir/ATutor/themes/clean_blue"
-rm -r $atutor_dir/ATutor/themes/clean_blue
-sleep 1
-
-echo "\nDisabling DEBUG if enabled."
-sed "s/define('AT_DEVEL', 1);/define('AT_DEVEL', 0);/" $atutor_dir/ATutor/include/vitals.inc.php > $atutor_dir/vitals.inc.php
-mv $atutor_dir/vitals.inc.php $atutor_dir/ATutor/include/
-sleep 1
+#echo "\nRemoving $atutor_dir/ATutor/themes/open_book"
+#rm -r $atutor_dir/ATutor/themes/open_book
+#sleep 1
 
-echo "\nRemoving $atutor_dir/ATutor/content/"
-rm -r $atutor_dir/ATutor/content/
+echo "\nRemoving $atutor_dir/ATutor/install/db/atutor_upgrade sql < 1.4"
+rm -r $atutor_dir/ATutor/install/db/atutor_upgrade_1.0_to_1.1.sql
+rm -r $atutor_dir/ATutor/install/db/atutor_upgrade_1.1_to_1.2.sql
+rm -r $atutor_dir/ATutor/install/db/atutor_upgrade_1.2_to_1.3.sql
+rm -r $atutor_dir/ATutor/install/db/atutor_upgrade_1.3_to_1.3.2.sql
+rm -r $atutor_dir/ATutor/install/db/atutor_upgrade_1.3.2_to_1.4.sql
 sleep 1
 
-echo "\nCreating $atutor_dir/ATutor/content"
-mkdir $atutor_dir/ATutor/content
-touch $atutor_dir/ATutor/content/index.html
-sleep 1
 
-echo "\nCreating $atutor_dir/ATutor/content/import"
-mkdir $atutor_dir/ATutor/content/import
-touch $atutor_dir/ATutor/content/import/index.html
+echo "\nDisabling AT_DEVEL if enabled."
+sed "s/define('AT_DEVEL', 1);/define('AT_DEVEL', 0);/" $atutor_dir/ATutor/include/vitals.inc.php > $atutor_dir/vitals.inc.php
+rm $atutor_dir/ATutor/include/vitals.inc.php
+echo "\nDisabling AT_DEVEL_TRANSLATE if enabled."
+sed "s/define('AT_DEVEL_TRANSLATE', 1);/define('AT_DEVEL_TRANSLATE', 0);/" $atutor_dir/vitals.inc.php > $atutor_dir/ATutor/include/vitals.inc.php
 sleep 1
 
-echo "\nCreating $atutor_dir/ATutor/content/chat"
-mkdir $atutor_dir/ATutor/content/chat
-touch $atutor_dir/ATutor/content/chat/index.html
-sleep 1
+echo -n "<?php "'$svn_data = '"'" >> $atutor_dir/ATutor/svn.php
+$svnexec log  -q -r HEAD http://svn.atutor.ca/repos/atutor/trunk/  >> $atutor_dir/ATutor/svn.php
+echo -n "';?>" >> $atutor_dir/ATutor/svn.php
 
 echo "\nTargz'ing $bundle${extension}.tar.gz $atutor_dir/ATutor/"
 sleep 1
@@ -143,6 +139,9 @@ if ($ans == "y") then
        rm -r $atutor_dir
 endif
 
+echo "\n\033[1m >> Did you update check_atutor_version.php ?? << \033[0m"
+
 echo "\n\033[1mBundle complete. Enjoy.\n\nExiting.\033[0m"
 
-exit 1
+
+exit 1
\ No newline at end of file