Address Islandora-Labs#98

DigitalGrinnell · Feb 10, 2016 · d95c74f · d95c74f
1 parent 30eabfe
commit d95c74f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/scripts/islandora_libraries.sh b/scripts/islandora_libraries.sh
@@ -5,10 +5,11 @@ echo "Installing all Islandora Foundation module's required libraries"
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck source=/dev/null
   . "$SHARED_DIR"/configs/variables
 fi
 
-cd "$DRUPAL_HOME"/sites/all/modules
+cd "$DRUPAL_HOME"/sites/all/modules || exit
 
 sudo drush cache-clear drush
 sudo drush -v videojs-plugin

diff --git a/scripts/islandora_modules.sh b/scripts/islandora_modules.sh
@@ -5,6 +5,7 @@ echo "Installing all Islandora Foundation modules"
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck source=/dev/null
   . "$SHARED_DIR"/configs/variables
 fi
 
@@ -17,32 +18,32 @@ sudo chmod -R 755 "$DRUPAL_HOME"/sites/all/modules
 sudo chmod -R 755 "$DRUPAL_HOME"/sites/default/files
 
 # Clone all Islandora Foundation modules
-cd "$DRUPAL_HOME"/sites/all/modules
-while read LINE; do
+cd "$DRUPAL_HOME"/sites/all/modules || exit
+while read -r LINE; do
   git clone https://github.com/Islandora/"$LINE"
 done < "$SHARED_DIR"/configs/islandora-module-list-sans-tuque.txt
 
 # Set git filemode false for git
-cd "$DRUPAL_HOME"/sites/all/modules
-while read LINE; do
-  cd "$LINE"
+cd "$DRUPAL_HOME"/sites/all/modules || exit
+while read -r LINE; do
+  cd "$LINE" || exit
   git config core.filemode false
-  cd "$DRUPAL_HOME"/sites/all/modules
+  cd "$DRUPAL_HOME"/sites/all/modules || exit
 done < "$SHARED_DIR"/configs/islandora-module-list-sans-tuque.txt
 
 # Clone Tuque, BagItPHP, and Cite-Proc
-cd "$DRUPAL_HOME"/sites/all
+cd "$DRUPAL_HOME"/sites/all || exit
 if [ ! -d libraries ]; then
   mkdir libraries
 fi
-cd "$DRUPAL_HOME"/sites/all/libraries
+cd "$DRUPAL_HOME"/sites/all/libraries || exit
 git clone https://github.com/Islandora/tuque.git
 git clone git://github.com/scholarslab/BagItPHP.git
 git clone https://github.com/Islandora/citeproc-php.git
 
-cd "$DRUPAL_HOME"/sites/all/libraries/tuque
+cd "$DRUPAL_HOME"/sites/all/libraries/tuque || exit
 git config core.filemode false
-cd "$DRUPAL_HOME"/sites/all/libraries/BagItPHP
+cd "$DRUPAL_HOME"/sites/all/libraries/BagItPHP || exit
 git config core.filemode false
 
 # Check for a user's .drush folder, create if it doesn't exist
@@ -52,22 +53,22 @@ if [ ! -d "$HOME_DIR/.drush" ]; then
 fi
 
 # Move OpenSeadragon drush file to user's .drush folder
-if [ -d "$HOME_DIR/.drush" -a -f "$DRUPAL_HOME/sites/all/modules/islandora_openseadragon/islandora_openseadragon.drush.inc" ]; then
+if [ -d "$HOME_DIR/.drush" ] && [ -f "$DRUPAL_HOME/sites/all/modules/islandora_openseadragon/islandora_openseadragon.drush.inc" ]; then
   mv "$DRUPAL_HOME/sites/all/modules/islandora_openseadragon/islandora_openseadragon.drush.inc" "$HOME_DIR/.drush"
 fi
 
 # Move video.js drush file to user's .drush folder
-if [ -d "$HOME_DIR/.drush" -a -f "$DRUPAL_HOME/sites/all/modules/islandora_videojs/islandora_videojs.drush.inc" ]; then
+if [ -d "$HOME_DIR/.drush" ] && [ -f "$DRUPAL_HOME/sites/all/modules/islandora_videojs/islandora_videojs.drush.inc" ]; then
   mv "$DRUPAL_HOME/sites/all/modules/islandora_videojs/islandora_videojs.drush.inc" "$HOME_DIR/.drush"
 fi
 
 # Move pdf.js drush file to user's .drush folder
-if [ -d "$HOME_DIR/.drush" -a -f "$DRUPAL_HOME/sites/all/modules/islandora_pdfjs/islandora_pdfjs.drush.inc" ]; then
+if [ -d "$HOME_DIR/.drush" ] && [ -f "$DRUPAL_HOME/sites/all/modules/islandora_pdfjs/islandora_pdfjs.drush.inc" ]; then
   mv "$DRUPAL_HOME/sites/all/modules/islandora_pdfjs/islandora_pdfjs.drush.inc" "$HOME_DIR/.drush"
 fi
 
 # Move IA Bookreader drush file to user's .drush folder
-if [ -d "$HOME_DIR/.drush" -a -f "$DRUPAL_HOME/sites/all/modules/islandora_internet_archive_bookreader/islandora_internet_archive_bookreader.drush.inc" ]; then
+if [ -d "$HOME_DIR/.drush" ] && [ -f "$DRUPAL_HOME/sites/all/modules/islandora_internet_archive_bookreader/islandora_internet_archive_bookreader.drush.inc" ]; then
   mv "$DRUPAL_HOME/sites/all/modules/islandora_internet_archive_bookreader/islandora_internet_archive_bookreader.drush.inc" "$HOME_DIR/.drush"
 fi
 
@@ -79,7 +80,7 @@ drush -y -u 1 en islandora_book_batch islandora_pathauto islandora_pdfjs islando
 drush -y -u 1 en xml_forms xml_form_builder xml_schema_api xml_form_elements xml_form_api jquery_update zip_importer islandora_basic_image islandora_bibliography islandora_compound_object islandora_google_scholar islandora_scholar_embargo islandora_solr_config citation_exporter doi_importer endnotexml_importer pmid_importer ris_importer
 drush -y -u 1 en islandora_fits islandora_ocr islandora_oai islandora_marcxml islandora_simple_workflow islandora_xacml_api islandora_xacml_editor islandora_xmlsitemap colorbox islandora_internet_archive_bookreader islandora_bagit islandora_batch_report islandora_usage_stats islandora_form_fieldpanel islandora_altmetrics islandora_populator islandora_newspaper_batch 
 
-cd "$DRUPAL_HOME"/sites/all/modules
+cd "$DRUPAL_HOME"/sites/all/modules || exit
 
 # Set variables for Islandora modules
 drush eval "variable_set('islandora_audio_viewers', array('name' => array('none' => 'none', 'islandora_videojs' => 'islandora_videojs'), 'default' => 'islandora_videojs'))"