Mirador #42

flummingbird · 2017-06-01T17:50:46Z

GitHub Issue: (Islandora/documentation#645)

What does this Pull Request do?

downloads the drupal 8 mirador module, which is note based off of core mirador but rather an obscure drupal friendly branch. Also pulls the mirador javascript dependency.

Feedback todos from last pull request have been completed.
Downloads and installs mirador drupal8 module, and JavaScript dependencies.

What's new?

permission issues fixed thanks to @ruebot @whikloj and @dannylamb

Added scripts/mirador.sh
Could this change impact execution of existing code?
no

How should this be tested?

To Test that the Pull Request does what is intended:

clone the repository

cd into repository folder

vagrant up

check localhost:8000/admin/config/media/mirador

Additional Notes:

I branched my own fork, I'm not sure if I can create a branch on the offical claw_vagrant to merge my PR into. Suggestions?

Interested parties

@Islandora-CLAW/committers @whikloj @ruebot @dannylamb

…kips a few steps of mirador install for you.

added needed line to Vagrant file for /scripts/mirador.sh currently commented out bc I haven't tested a clean build of all this together.

ruebot · 2017-06-01T17:53:10Z

scripts/mirador.sh

+
+rm /tmp/mirador-8.x-1.x-dev.zip
+
+#echo 'drush en mirador -y'


whikloj · 2017-06-02T16:44:24Z

Ahhh I didn't realize there was a new PR. This supercedes #41.

whikloj · 2017-06-02T16:48:35Z

@flummingbird so the only thing I would suggest is to perhaps take a look at this section of another script.

We download into a specific location and only if the file doesn't exist.

That way if you do a vagrant destroy; vagrant up and the versions haven't changed you don't need to re-download those files. We just copy them into the /tmp directory (for example) and move ahead.

Reduces time on rebuilding and allows you to build a machine while offline.

ruebot · 2017-06-05T14:07:56Z

@flummingbird once you take care of @whikloj's request, I'll test. Let me know if you need a hand with what @whikloj is talking about.

conditional download and enabling, prevents repeated downloads, and uses proper $DOWNLOAD_DIR variable. I have tested it locally and it works like a charm.

flummingbird

I've made some changes, I believe it is ready.

uncouple download to wait for each check. Enable and unzip go outside the conditional downloads.

puts unzip back in conditional check.

ruebot · 2017-06-05T15:59:31Z

Vagrantfile

@@ -57,6 +57,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  config.vm.provision :shell, :path => "./scripts/islandora-karaf-components.sh", :args => home_dir
  config.vm.provision :shell, :path => "./scripts/config.sh", :args => home_dir
  config.vm.provision :shell, :path => "./scripts/crayfish.sh", :args => home_dir
+  config.vm.provision :shell, :path => "./scripts/mirador.sh", :args => home_dir


This should be after drupal.sh https://github.com/Islandora-CLAW/claw_vagrant/blob/master/Vagrantfile#L51

whikloj · 2017-06-05T17:18:32Z

scripts/mirador.sh

+if [ ! -f "$DOWNLOAD_DIR/master.zip" ]; then
+    echo "Downloading mirador-js dependencies"
+    cd "$DOWNLOAD_DIR" && { curl -LOk https://github.com/NVLI/mirador-js/archive/master.zip; cd -;}
+    cd "$DRUPAL_HOME"/web/libraries && { unzip "$DOWNLOAD_DIR"/master.zip -d . ;}


@flummingbird this line needs to move outside the if...fi (line 16) as it should occur whenever a box is provisioned and is separate from the downloading.
The way I think of it is that lines 10-12, is just checking if you have downloading the application before.
Then line 13 is deploying that application into your vagrant machine.

So you can conceivably run lines 10-12 once and use line 13 waaaaaay more than that.

whikloj · 2017-06-05T17:19:04Z

scripts/mirador.sh

+if  [ ! -f "$DOWNLOAD_DIR/mirador-8.x-1.x-dev.zip" ]; then
+    echo "Downolading mirador drupal module"
+    cd "$DOWNLOAD_DIR" && { curl -LOk https://ftp.drupal.org/files/projects/mirador-8.x-1.x-dev.zip ;}
+    cd "$DRUPAL_HOME"/web/modules/contrib/ && { unzip "$DOWNLOAD_DIR"/mirador-8.x-1.x-dev.zip -d . ;}


Same thing as described above

whikloj · 2017-06-05T17:19:35Z

scripts/mirador.sh

+fi
+
+if  [ ! -f "$DOWNLOAD_DIR/mirador-8.x-1.x-dev.zip" ]; then
+    echo "Downolading mirador drupal module"


typo Downolading

typey type-OH

unzips outside of DL function.

ruebot · 2017-06-05T19:20:06Z

vagrant up

ruebot · 2017-06-05T19:57:07Z

Looks good.

ruebot

@whikloj I'll leave you to merge this once you're good with it.

flummingbird · 2017-06-05T20:22:15Z

🕺

whikloj · 2017-06-23T17:54:14Z

@flummingbird just wanted to let you know, I haven't forgotten about this. I think due to the Mirador module only working against the image type and image not allowing you to upload anything that isn't a gif, jpeg, or png... we need to hold this until 8.4.x is released and we move to it.

flummingbird added 4 commits May 31, 2017 15:11

initial commit, pretty sure that I did many things "wrong.." but it s…

493b3a7

…kips a few steps of mirador install for you.

Merge branch 'master' of https://github.com/flummingbird/claw_vagrant

4f2e254

Update Vagrantfile

f49c7df

added needed line to Vagrant file for /scripts/mirador.sh currently commented out bc I haven't tested a clean build of all this together.

fullfill PR feedback tasks

d7f690f

ruebot reviewed Jun 1, 2017

View reviewed changes

scripts/mirador.sh Outdated

rm /tmp/mirador-8.x-1.x-dev.zip

#echo 'drush en mirador -y'

Copy link

Contributor

ruebot Jun 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

remove comment per feedback

6a97c44

Update mirador.sh

184e8b7

conditional download and enabling, prevents repeated downloads, and uses proper $DOWNLOAD_DIR variable. I have tested it locally and it works like a charm.

flummingbird commented Jun 5, 2017

View reviewed changes

flummingbird added 2 commits June 5, 2017 10:04

Update mirador.sh

e69699f

uncouple download to wait for each check. Enable and unzip go outside the conditional downloads.

Update mirador.sh

bde4ad2

puts unzip back in conditional check.

ruebot suggested changes Jun 5, 2017

View reviewed changes

Update Vagrantfile

c0cd16b

whikloj reviewed Jun 5, 2017

View reviewed changes

flummingbird added 2 commits June 5, 2017 13:23

Update mirador.sh

331527c

typey type-OH

Update mirador.sh

5398017

unzips outside of DL function.

ruebot approved these changes Jun 5, 2017

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mirador #42

Mirador #42

flummingbird commented Jun 1, 2017 •

edited

Loading

ruebot Jun 1, 2017

whikloj commented Jun 2, 2017

whikloj commented Jun 2, 2017

ruebot commented Jun 5, 2017

flummingbird left a comment

ruebot Jun 5, 2017

whikloj Jun 5, 2017

whikloj Jun 5, 2017

whikloj Jun 5, 2017

flummingbird Jun 5, 2017

ruebot commented Jun 5, 2017

ruebot commented Jun 5, 2017

ruebot left a comment

flummingbird commented Jun 5, 2017

whikloj commented Jun 23, 2017

Mirador #42

Are you sure you want to change the base?

Mirador #42

Conversation

flummingbird commented Jun 1, 2017 • edited Loading

What does this Pull Request do?

What's new?

How should this be tested?

Additional Notes:

Interested parties

ruebot Jun 1, 2017

Choose a reason for hiding this comment

whikloj commented Jun 2, 2017

whikloj commented Jun 2, 2017

ruebot commented Jun 5, 2017

flummingbird left a comment

Choose a reason for hiding this comment

ruebot Jun 5, 2017

Choose a reason for hiding this comment

whikloj Jun 5, 2017

Choose a reason for hiding this comment

whikloj Jun 5, 2017

Choose a reason for hiding this comment

whikloj Jun 5, 2017

Choose a reason for hiding this comment

flummingbird Jun 5, 2017

Choose a reason for hiding this comment

ruebot commented Jun 5, 2017

ruebot commented Jun 5, 2017

ruebot left a comment

Choose a reason for hiding this comment

flummingbird commented Jun 5, 2017

whikloj commented Jun 23, 2017

flummingbird commented Jun 1, 2017 •

edited

Loading