Merge pull request #3 from kurund/matrix

fixed the language and variable refering to svn
civicrm · Mar 1, 2013 · da5202b · da5202b
2 parents 0221d82 + b8b6550
commit da5202b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/bin/regen.sh b/bin/regen.sh
@@ -11,11 +11,11 @@ else
 fi
 
 pushd .
-cd $SVNROOT
+cd $CIVISOURCEDIR
 svn up .
-cd $SVNROOT/bin
+cd $CIVISOURCEDIR/bin
 ./setup.sh
-cd $SVNROOT/sql
+cd $CIVISOURCEDIR/sql
 
 echo; echo "Dropping civicrm_* tables from database $DBNAME"
 # mysqladmin -f -u $DBUSER $PASSWDSECTION $DBARGS drop $DBNAME
@@ -38,12 +38,12 @@ mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME < zipcodes.mysql
 php GenerateData.php
 
 # run the cli script to build the menu and the triggers
-cd $SVNROOT
+cd $CIVISOURCEDIR
 "$PHP5PATH"php bin/cli.php -e System -a flush --triggers 1 --session 1
 
 mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME -e "DROP TABLE zipcodes; UPDATE civicrm_domain SET config_backend = NULL; UPDATE civicrm_setting SET value = NULL WHERE name = 'userFrameworkResourceURL'  OR name = 'imageUploadURL';"
 
-cd $SVNROOT/sql
+cd $CIVISOURCEDIR/sql
 mysqldump -cent --skip-triggers -u $DBUSER $PASSWDSECTION $DBARGS $DBNAME > civicrm_generated.mysql
 #cat civicrm_sample_report.mysql >> civicrm_generated.mysql
 cat civicrm_sample_custom_data.mysql >> civicrm_generated.mysql

diff --git a/bin/regen.sh.txt b/bin/regen.sh.txt
@@ -11,11 +11,11 @@ else
 fi
 
 pushd .
-cd $SVNROOT
+cd $CIVISOURCEDIR
 svn up .
-cd $SVNROOT/bin
+cd $CIVISOURCEDIR/bin
 ./setup.sh
-cd $SVNROOT/sql
+cd $CIVISOURCEDIR/sql
 
 echo; echo "Dropping civicrm_* tables from database $DBNAME"
 # mysqladmin -f -u $DBUSER $PASSWDSECTION $DBARGS drop $DBNAME
@@ -38,12 +38,12 @@ mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME < zipcodes.mysql
 php GenerateData.php
 
 # run the cli script to build the menu and the triggers
-cd $SVNROOT
+cd $CIVISOURCEDIR
 "$PHP5PATH"php bin/cli.php -e System -a flush --triggers 1 --session 1
 
 mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME -e "DROP TABLE zipcodes; UPDATE civicrm_domain SET config_backend = NULL; UPDATE civicrm_setting SET value = NULL WHERE name = 'userFrameworkResourceURL'  OR name = 'imageUploadURL';"
 
-cd $SVNROOT/sql
+cd $CIVISOURCEDIR/sql
 mysqldump -cent --skip-triggers -u $DBUSER $PASSWDSECTION $DBARGS $DBNAME > civicrm_generated.mysql
 #cat civicrm_sample_report.mysql >> civicrm_generated.mysql
 cat civicrm_sample_custom_data.mysql >> civicrm_generated.mysql

diff --git a/bin/setup.conf.txt b/bin/setup.conf.txt
@@ -1,5 +1,5 @@
-# Define the root of your svn directory here
-SVNROOT=
+# Define the path for civicrm source directory here
+CIVISOURCEDIR=
 
 # define your schema file name here, will be overriden by
 # FIRST command line argument if given