http://atutor.ca/atutor/mantis/view.php?id=4785

[atutor.git] / bundle.sh

diff --git a/bundle.sh b/bundle.sh
index bb639ec..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,14 +45,16 @@ 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 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
+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
@@ -60,17 +64,13 @@ 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
 
-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 "\nRemoving $atutor_dir/ATutor/themes/clean_blue"
+#rm -r $atutor_dir/ATutor/themes/clean_blue
+#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/themes/open_book"
+#rm -r $atutor_dir/ATutor/themes/open_book
+#sleep 1
 
 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
@@ -89,7 +89,7 @@ sed "s/define('AT_DEVEL_TRANSLATE', 1);/define('AT_DEVEL_TRANSLATE', 0);/" $atut
 sleep 1
 
 echo -n "<?php "'$svn_data = '"'" >> $atutor_dir/ATutor/svn.php
-svn log  -q -r HEAD http://atutorsvn.atrc.utoronto.ca/repos/atutor/trunk/  >> $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/"
@@ -144,4 +144,4 @@ 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