Distmaker fixes for 4.5

diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh
index ca8c0a21ba032599a207ce691276fa3444580856..5b7436d9a12d6da48dc724ebf4a53a0e74f3b583 100755 (executable)
--- a/distmaker/dists/drupal6_php5.sh
+++ b/distmaker/dists/drupal6_php5.sh
@@ -32,7 +32,7 @@ if [ -d $TRG ] ; then
 fi
 
 # copy all the stuff
-for CODE in css i js packages PEAR templates bin CRM api drupal extern Reports install settings; do
+for CODE in css i js packages PEAR templates bin CRM api drupal extern Reports install settings Civi; do
   echo $CODE
   [ -d $SRC/$CODE ] && $RSYNCCOMMAND $SRC/$CODE $TRG
 done
@@ -50,7 +50,7 @@ if [ ! -d $TRG/sql ] ; then
        mkdir $TRG/sql
 fi
 
-for F in $SRC/sql/civicrm*.mysql $SRC/sql/counties.US.sql.gz $SRC/sql/case_sample*.mysql; do
+for F in $SRC/sql/civicrm*.mysql $SRC/sql/case_sample*.mysql; do
        cp $F $TRG/sql
 done
 

diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh
index 1881d44606a9eeb05ff2935604c7d611221c002b..24961a3ad733ff28c1348fa8ae67e0cb0b523fb7 100755 (executable)
--- a/distmaker/dists/drupal_php5.sh
+++ b/distmaker/dists/drupal_php5.sh
@@ -31,7 +31,7 @@ if [ -d $TRG ] ; then
 fi
 
 # copy all the stuff
-for CODE in css i js packages PEAR templates bin CRM api drupal extern Reports install settings; do
+for CODE in css i js packages PEAR templates bin CRM api drupal extern Reports install settings Civi; do
   echo $CODE
   [ -d $SRC/$CODE ] && $RSYNCCOMMAND $SRC/$CODE $TRG
 done
@@ -49,7 +49,7 @@ if [ ! -d $TRG/sql ] ; then
        mkdir $TRG/sql
 fi
 
-for F in $SRC/sql/civicrm*.mysql $SRC/sql/counties.US.sql.gz $SRC/sql/case_sample*.mysql; do
+for F in $SRC/sql/civicrm*.mysql $SRC/sql/case_sample*.mysql; do
        cp $F $TRG/sql
 done
 

diff --git a/distmaker/dists/drupal_sk_php5.sh b/distmaker/dists/drupal_sk_php5.sh
index f6da93bd4c4aace8b4065d879df77d506ac4a389..6adaa0885c9f7a91bfa1497f3ef51c5ca44e1bd1 100755 (executable)
--- a/distmaker/dists/drupal_sk_php5.sh
+++ b/distmaker/dists/drupal_sk_php5.sh
@@ -31,7 +31,7 @@ if [ -d $TRG ] ; then
 fi
 
 # copy all the stuff
-for CODE in css i js packages PEAR templates bin CRM api drupal extern Reports install settings; do
+for CODE in css i js packages PEAR templates bin CRM api drupal extern Reports install settings Civi; do
   echo $CODE
   [ -d $SRC/$CODE ] && $RSYNCCOMMAND $SRC/$CODE $TRG
 done
@@ -58,7 +58,7 @@ if [ ! -d $TRG/sql ] ; then
        mkdir $TRG/sql
 fi
 
-for F in $SRC/sql/civicrm*.mysql $SRC/sql/counties.US.sql.gz $SRC/sql/case_sample*.mysql; do
+for F in $SRC/sql/civicrm*.mysql $SRC/sql/case_sample*.mysql; do
        cp $F $TRG/sql
 done
 

diff --git a/distmaker/dists/joomla_php5.sh b/distmaker/dists/joomla_php5.sh
index 1387c7dd5659b0203a70e604ca42352c4d9876be..e3522091a23829480bb08ede54a778cc80ee54de 100755 (executable)
--- a/distmaker/dists/joomla_php5.sh
+++ b/distmaker/dists/joomla_php5.sh
@@ -31,7 +31,7 @@ if [ -d $TRG ] ; then
 fi
 
 # copy all the rest of the stuff
-for CODE in css i install js packages PEAR templates bin joomla CRM api extern Reports settings; do
+for CODE in css i install js packages PEAR templates bin joomla CRM api extern Reports settings Civi; do
   echo $CODE
   [ -d $SRC/$CODE ] && $RSYNCCOMMAND $SRC/$CODE $TRG
 done
@@ -47,7 +47,7 @@ fi
 if [ ! -d $TRG/sql ] ; then
        mkdir $TRG/sql
 fi
-for F in $SRC/sql/civicrm*.mysql $SRC/sql/counties.US.sql.gz $SRC/sql/case_sample*.mysql; do
+for F in $SRC/sql/civicrm*.mysql $SRC/sql/case_sample*.mysql; do
        cp $F $TRG/sql
 done
 

diff --git a/distmaker/dists/l10n.sh b/distmaker/dists/l10n.sh
index df19397a92449f45b64f6f83a6a41a634986e7cc..63c6ce6784833bb62db060a469cf5006a20f04e8 100644 (file)
--- a/distmaker/dists/l10n.sh
+++ b/distmaker/dists/l10n.sh
@@ -37,7 +37,7 @@ if [ ! -d $TRG/sql ] ; then
        mkdir $TRG/sql
 fi
 
-for F in $SRC/sql/civicrm*.mysql $SRC/sql/counties.US.sql.gz $SRC/sql/case_sample*.mysql; do
+for F in $SRC/sql/civicrm*.mysql $SRC/sql/case_sample*.mysql; do
        cp $F $TRG/sql
 done
 

diff --git a/distmaker/dists/wordpress_php5.sh b/distmaker/dists/wordpress_php5.sh
index 32c6c05f9d5907d3c2acfac8d21f455ae87863b1..9607f945920bd11978404aa29b8c06e00ff40183 100644 (file)
--- a/distmaker/dists/wordpress_php5.sh
+++ b/distmaker/dists/wordpress_php5.sh
@@ -43,7 +43,7 @@ if [ ! -d $TRG/civicrm/civicrm ] ; then
 fi
 
 # copy all the stuff
-for CODE in css i js packages PEAR templates bin CRM api extern Reports install settings; do
+for CODE in css i js packages PEAR templates bin CRM api extern Reports install settings Civi; do
   echo $CODE
   [ -d $SRC/$CODE ] && $RSYNCCOMMAND $SRC/$CODE $TRG/civicrm/civicrm
 done
@@ -60,7 +60,7 @@ if [ ! -d $TRG/civicrm/civicrm/sql ] ; then
        mkdir $TRG/civicrm/civicrm/sql
 fi
 
-for F in $SRC/sql/civicrm*.mysql $SRC/sql/counties.US.sql.gz $SRC/sql/case_sample*.mysql; do
+for F in $SRC/sql/civicrm*.mysql $SRC/sql/case_sample*.mysql; do
        cp $F $TRG/civicrm/civicrm/sql
 done