More fixes.

Author: dashohoxha

modules/custom/btrCore/btrCore.admin.inc

@@ -100,6 +100,8 @@ function btrCore_config_set_languages() {
   field_update_field($info);
 
   // Update the cached value of btrClient_languages.
-  cache_clear_all('btrClient_languages', 'cache_btrClient');
-  $languages = btrClient_get_languages();
+  if (module_exists('btrClient')) {
+    cache_clear_all('btrClient_languages', 'cache_btrClient');
+    $languages = btrClient_get_languages();
+  }
 }

modules/custom/btrCore/data/import/vocabulary.sh

@@ -4,8 +4,8 @@
 ### go to the script directory
 cd $(dirname $0)
 
-### get config vars
-. ../config.sh
+### set drush site
+drush="drush $1"
 
 origin='vocabulary'
 for file in $(ls vocabulary/*.po)

modules/custom/btrCore/data/install.sh

@@ -8,7 +8,7 @@ mysql=$(drush sql-connect)
 $mysql < db/btr_schema.sql
 
 ### import the vocabulary projects
-import/vocabulary.sh
+import/vocabulary.sh --root=/var/www/btr
 
 ### import some PO files, just for testing/development
 test/update.sh

modules/custom/btrCore/data/test/import-kdeadmin.sh

@@ -3,8 +3,8 @@
 ### go to the script directory
 cd $(dirname $0)
 
-### set drush alias
-drush="drush $1"
+### set drush root
+drush="drush --root=/var/www/btr"
 
 ### set some variables
 origin=test

modules/custom/btrCore/data/test/import-kturtle.sh

@@ -3,8 +3,8 @@
 ### go to the script directory
 cd $(dirname $0)
 
-### set drush alias
-drush="drush $1"
+### set drush root
+drush="drush --root=/var/www/btr"
 
 ### set some variables
 origin=test

modules/custom/btrCore/data/test/import-office-desktop.sh

@@ -3,8 +3,8 @@
 ### go to the script directory
 cd $(dirname $0)
 
-### set drush alias
-drush="drush $1"
+### set drush root
+drush="drush --root=/var/www/btr"
 
 ### set some variables
 origin=test

modules/custom/btrCore/data/test/import-pingus.sh

@@ -3,8 +3,8 @@
 ### go to the script directory
 cd $(dirname $0)
 
-### set drush alias
-drush="drush $1"
+### set drush root
+drush="drush --root=/var/www/btr"
 
 ### set some variables
 origin=test