Merge pull request #1 from Islandora-Labs/master

updating fork

README.md

@@ -90,6 +90,7 @@ To create a custom base box to use with Atlas (e.g., if you need different versi
 
 * [Nick Ruest](https://github.com/ruebot)
 * [Luke Taylor](https://github.com/lutaylor)
+* [Don Richards](https://github.com/donrichards)
 
 ## Authors
 

configs/variables

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2034
 
 HOME_DIR="/home/vagrant"
 

scripts/bootstrap.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
 SHARED_DIR=$1
-
+# shellcheck source=/configs/variables
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1091
   . "$SHARED_DIR"/configs/variables
 fi
 

scripts/devtools.sh

@@ -52,7 +52,7 @@ chmod +x /usr/local/bin/phpcb
 
 # Coder & Code Sniffer
 pear install PHP_CodeSniffer
-cd /tmp
+cd /tmp || exit
 wget -q http://ftp.drupal.org/files/projects/coder-8.x-2.1.tar.gz
 tar -xzvf coder-8.x-2.1.tar.gz
 mv -v coder /usr/share

scripts/djatoka.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
 SHARED_DIR=$1
-
+# shellcheck source=./configs/variables
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1091
   . "$SHARED_DIR"/configs/variables
 fi
 
@@ -18,10 +19,10 @@ if [ ! -f "$DOWNLOAD_DIR/adore-djatoka.tar.gz" ]; then
   wget -q -O "$DOWNLOAD_DIR/adore-djatoka.tar.gz" "http://downloads.sourceforge.net/project/djatoka/djatoka/1.1/adore-djatoka-1.1.tar.gz"
 fi
 
-cd /tmp
+cd /tmp || exit
 cp "$DOWNLOAD_DIR/adore-djatoka.tar.gz" /tmp
 tar -xzvf adore-djatoka.tar.gz
-cd adore-djatoka-1.1
+cd adore-djatoka-1.1 || exit
 mv -v ./* "$DJATOKA_HOME"
 
 # Symlink kdu_compress for Large Image Solution Pack

scripts/drupal.sh

@@ -5,6 +5,7 @@ echo "Installing Drupal."
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1090
   . "$SHARED_DIR"/configs/variables
 fi
 
@@ -25,7 +26,7 @@ sudo mv drush-6.3 /opt/
 sudo ln -s /opt/drush-6.3/drush /usr/bin/drush
 a2enmod rewrite
 service apache2 reload
-cd /var/www
+cd /var/www || exit
 
 # Download Drupal
 drush dl drupal --drupal-project-rename=drupal
@@ -35,7 +36,7 @@ chown -R www-data:www-data drupal
 chmod -R g+w drupal
 
 # Do the install
-cd drupal
+cd drupal || exit
 drush si -y --db-url=mysql://root:islandora@localhost/drupal7 --site-name=islandora-development.org
 drush user-password admin --password=islandora
 
@@ -57,8 +58,9 @@ sed -i 's#<VirtualHost \*:80>#<VirtualHost \*:8000>#' $APACHE_CONFIG_FILE
 sed -i 's/Listen 80/Listen \*:8000/' /etc/apache2/ports.conf
 
 sed -i "/Listen \*:8000/a \
-NameVirtualHost \*:8000" /etc/apache2/ports.conf 
+NameVirtualHost \*:8000" /etc/apache2/ports.conf
 
+# shellcheck disable=SC2162
 read -d '' APACHE_CONFIG << APACHE_CONFIG_TEXT
 	ServerAlias islandora-vagrant
 
@@ -103,7 +105,7 @@ service apache2 restart
 if [ ! -d sites/all/modules ]; then
   mkdir -p sites/all/modules
 fi
-cd sites/all/modules
+cd sites/all/modules || exit
 
 # Modules
 drush dl devel imagemagick ctools jquery_update pathauto xmlsitemap views variable token libraries datepicker date
@@ -121,5 +123,5 @@ service apache2 restart
 chown -hR www-data:www-data "$DRUPAL_HOME"/sites/default/files
 
 # Run cron
-cd "$DRUPAL_HOME"/sites/all/modules
+cd "$DRUPAL_HOME"/sites/all/modules || exit
 drush cron

scripts/fcrepo.sh

@@ -6,6 +6,7 @@ echo "Preparing to install Fedora."
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1090
   . "$SHARED_DIR"/configs/variables
 fi
 
@@ -58,7 +59,7 @@ rm "$FEDORA_HOME"/data/fedora-xacml-policies/repository-policies/default/deny-pu
 rm "$FEDORA_HOME"/data/fedora-xacml-policies/repository-policies/default/deny-purge-object-if-active-or-inactive.xml
 rm "$FEDORA_HOME"/data/fedora-xacml-policies/repository-policies/default/deny-reloadPolicies-if-not-localhost.xml
 
-cd "$FEDORA_HOME"/data/fedora-xacml-policies/repository-policies/
+cd "$FEDORA_HOME"/data/fedora-xacml-policies/repository-policies/ || exit
 git clone https://github.com/Islandora/islandora-xacml-policies.git islandora
 rm "$FEDORA_HOME"/data/fedora-xacml-policies/repository-policies/islandora/permit-apim-to-anonymous-user.xml
 rm "$FEDORA_HOME"/data/fedora-xacml-policies/repository-policies/islandora/permit-upload-to-anonymous-user.xml

scripts/ffmpeg.sh

@@ -5,6 +5,7 @@ echo "Installing FFmpeg."
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1090
   . "$SHARED_DIR"/configs/variables
 fi
 
@@ -22,7 +23,7 @@ if [ ! -f "$DOWNLOAD_DIR/ffmpeg-$FFMPEG_VERSION.tar.gz" ]; then
   echo "Downloading FFMpeg"
   wget -q -O "$DOWNLOAD_DIR/ffmpeg-$FFMPEG_VERSION.tar.gz" "http://www.ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.gz"
 fi
-cd /tmp
+cd /tmp || exit
 cp "$DOWNLOAD_DIR/ffmpeg-$FFMPEG_VERSION.tar.gz" /tmp
 tar -xzvf ffmpeg-"$FFMPEG_VERSION".tar.gz
 

scripts/fits.sh

@@ -5,6 +5,7 @@ echo "Installing FITS"
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1090
   . "$SHARED_DIR"/configs/variables
 fi
 
@@ -20,6 +21,6 @@ if [ ! -f "$DOWNLOAD_DIR/fits-$FITS_VERSION.zip" ]; then
 fi
 
 unzip "$DOWNLOAD_DIR/fits-$FITS_VERSION.zip" -d "$FITS_HOME"
-cd "$FITS_HOME/fits-$FITS_VERSION"
+cd "$FITS_HOME/fits-$FITS_VERSION" || exit
 chmod +x fits.sh
 chmod +x fits-env.sh

scripts/gsearch.sh

@@ -5,27 +5,28 @@ echo "Installing GSearch"
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1090
   . "$SHARED_DIR"/configs/variables
 fi
 
 # Dependencies
-cd /tmp
+cd /tmp || exit
 git clone https://github.com/discoverygarden/basic-solr-config.git
-cd basic-solr-config
+cd basic-solr-config || exit
 git checkout 4.x
-cd islandora_transforms
+cd islandora_transforms || exit
 sed -i 's#/usr/local/fedora/tomcat#/var/lib/tomcat7#g' ./*xslt
 
 # dgi_gsearch_extensions
-cd /tmp
+cd /tmp || exit
 git clone https://github.com/discoverygarden/dgi_gsearch_extensions.git
-cd dgi_gsearch_extensions
+cd dgi_gsearch_extensions || exit
 mvn -q package
 
 # Build GSearch
-cd /tmp
+cd /tmp || exit
 git clone https://github.com/fcrepo3/gsearch.git
-cd gsearch/FedoraGenericSearch
+cd gsearch/FedoraGenericSearch || exit
 ant buildfromsource
 
 # Deploy GSearch
@@ -39,7 +40,7 @@ service tomcat7 restart
 sleep 75
 
 # GSearch configurations
-cd /var/lib/tomcat7/webapps/fedoragsearch/WEB-INF/classes
+cd /var/lib/tomcat7/webapps/fedoragsearch/WEB-INF/classes || exit
 wget -q http://alpha.library.yorku.ca/fgsconfigFinal.zip
 unzip fgsconfigFinal.zip
 

scripts/sleuthkit.sh

@@ -5,6 +5,7 @@ echo "Installing Sleuthkit."
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1090
   . "$SHARED_DIR"/configs/variables
 fi
 
@@ -15,6 +16,6 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get install libafflib-dev afflib-tools libewf-dev ewf-tools -y --force-yes
 
 # Clone and compile Sleuthkit
-cd /tmp
+cd /tmp || exit
 git clone https://github.com/sleuthkit/sleuthkit.git
 cd sleuthkit && ./bootstrap && ./configure && make && make install && ldconfig

scripts/solr.sh

@@ -5,6 +5,7 @@ echo "Installing Solr"
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1090
   . "$SHARED_DIR"/configs/variables
 fi
 
@@ -13,15 +14,15 @@ if [ ! -f "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" ]; then
   echo "Downloading Solr"
   wget -q -O "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" "http://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
 fi
-cd /tmp
+cd /tmp || exit
 cp "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" /tmp
 tar -xzvf solr-"$SOLR_VERSION".tgz
 
 # Prepare SOLR_HOME
 if [ ! -d "$SOLR_HOME" ]; then
   mkdir "$SOLR_HOME"
 fi
-cd /tmp/solr-"$SOLR_VERSION"/example/solr
+cd /tmp/solr-"$SOLR_VERSION"/example/solr || exit
 mv -v ./* "$SOLR_HOME"
 chown -hR tomcat7:tomcat7 "$SOLR_HOME"
 

scripts/tesseract.sh

@@ -5,6 +5,7 @@ echo "Installing Tesseract"
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1090
   . "$SHARED_DIR"/configs/variables
 fi
 

scripts/warctools.sh

@@ -5,6 +5,7 @@ echo "Installing warctools."
 SHARED_DIR=$1
 
 if [ -f "$SHARED_DIR/configs/variables" ]; then
+  # shellcheck disable=SC1090
   . "$SHARED_DIR"/configs/variables
 fi
 
@@ -15,6 +16,6 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get install python-setuptools python-unittest2 -y --force-yes
 
 # Clone and build warctools
-cd /tmp
+cd /tmp || exit
 git clone https://github.com/internetarchive/warctools.git
 cd warctools && ./setup.py build && ./setup.py install