Merge pull request #47 from uml-digitalinitiatives/7.x-ISLANDORA-1213

Fixes for drush command handling of paths.
Islandora · Mar 24, 2015 · 726dc2d · 726dc2d
2 parents 1440e8b + c2e4081
commit 726dc2d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/islandora_openseadragon.drush.inc b/islandora_openseadragon.drush.inc
@@ -10,6 +10,12 @@
  */
 define('OPENSEADRAGON_DOWNLOAD_URI', 'http://openseadragon.github.io/releases/openseadragon-bin-0.9.129.zip');
 
+/**
+ * The original OpenSeadragon directory
+ */
+define('OPENSEADRAGON_ORIGINAL_DIR', 'openseadragon-bin-0.9.129');
+
+
 /**
  * Implements hook_drush_command().
  */
@@ -48,7 +54,7 @@ function drush_islandora_openseadragon_plugin() {
     $path = $args[0];
   }
   else {
-    $path = 'sites/all/libraries';
+    $path = _drush_core_directory("@site:sites/all/libraries");
   }
 
   // Create the path if it does not exist.
@@ -64,7 +70,7 @@ function drush_islandora_openseadragon_plugin() {
   // Download the zip archive.
   if ($filepath = drush_download_file(OPENSEADRAGON_DOWNLOAD_URI)) {
     $filename = basename($filepath);
-    $dirname = 'openseadragon';
+    $dirname = OPENSEADRAGON_ORIGINAL_DIR;
 
     // Remove any existing Openseadragon plugin directory.
     if (is_dir($dirname) || is_dir('openseadragon')) {