Commit d28f4b39 authored by Eric Bremner's avatar Eric Bremner
Browse files

Merge branch 'ISTWCMS-4487-ebremner-relocate-gesso' into '8.x-3.x'

Istwcms 4487 ebremner relocate gesso

See merge request !46
parents 271cfecb a459f5bc
......@@ -82,19 +82,18 @@ else
interactivity=0
fi
# Set up defaults.
script_path=`pwd`
gesso_root_default='/var/www/html'
if [[ "$script_path" == *"app"* ]]; then
drupal_root_default='/app'
gesso_root_default='/app'
elif [[ "$script_path" == *"alt"* ]]; then
drupal_root_default='/var/www/drupal8alt'
else
drupal_root_default='/var/www/drupal8'
fi
if [ ${interactivity} == 1 ]; then
# Set up defaults.
script_path=`pwd`
gesso_root_default='/var/www/html'
if [[ "$script_path" == *"app"* ]]; then
drupal_root_default='/app'
gesso_root_default='/app'
elif [[ "$script_path" == *"alt"* ]]; then
drupal_root_default='/var/www/drupal8alt'
else
drupal_root_default='/var/www/drupal8'
fi
# Ask install questions.
echo "What would you like to do?"
echo "1 = Rebuild profile (non-development)."
......@@ -124,8 +123,10 @@ if [ ${interactivity} == 1 ]; then
printf "\nDrupal root directory: [$drupal_root_default]: "
read -r drupal_root_dir
printf "\nGesso branch/tag: [8.x-3.x]: "
read -r gesso_branch_tag
if [ ${build_option} == "2" ] || [ ${build_option} == "3" ]; then
printf "\nGesso branch/tag: [8.x-3.x]: "
read -r gesso_branch_tag
fi
if [ ${build_option} == "2" ] || [ ${build_option} == "3" ]; then
printf "\nGesso root directory: [$gesso_root_default]: "
......
......@@ -18,7 +18,15 @@ git checkout $gesso_branch_tag
sh build_gesso.sh
cd $drupal_root_dir/profiles/uw_base_profile/themes/uw_fdsu_theme_resp
cd $drupal_root_dir/profiles/uw_base_profile/modules/features/uw_wcms_gesso
rm -rf source
rm -rf css
rm -rf js
rm -rf images
ln --force --symbolic "$gesso_root_dir/uw_wcms_gesso/source" source
......
drupal_root_dir=${1-/var/www/drupal8}
gesso_branch_tag=${2-8.x-3.x}
echo "Getting gesso files ..."
mkdir --parents $drupal_root_dir/profiles/uw_base_profile/themes/uw_fdsu_theme_resp
cd $drupal_root_dir/profiles/uw_base_profile/themes/uw_fdsu_theme_resp || exit 1
mkdir --parents source
mkdir --parents css
mkdir --parents js
mkdir --parents images
git clone https://git.uwaterloo.ca/wcms/uw_wcms_gesso.git || exit 1
cd uw_wcms_gesso
git checkout $gesso_tag_branch
cp -R source/* ../source
cp css/styles.css ../css
cp js/component_scripts.min.js ../js
cp -R images/* ../source/images
cd ..
rm -rf uw_wcms_gesso
echo "Done getting gesso files."
......@@ -9,10 +9,6 @@ echo "Starting rebuild of the profile..."
# reinstall. Using "composer update" will not always update modules
# referenced by branch instead of tag.
echo "Installing config..."
rm --recursive --force ../../config
git clone --depth 1 --branch wcms-3 ist-git@git.uwaterloo.ca:wcms/config.git ../../config
echo "Deleting the composer.lock file..."
rm --force composer.lock
......@@ -26,23 +22,11 @@ echo "Clearing the composer cache..."
composer clear-cache
echo "Done clearing the composer cache..."
if [ ${build_option} = 1 ]; then
echo "Running composer install..."
composer install --no-dev --no-interaction
echo ""
echo "Done rebuilding profile without dev modules."
echo ""
else
echo "Running composer install..."
composer install --no-interaction
echo ""
echo "Done rebuilding profile."
echo ""
fi
if [ ${build_option} = 1 ]; then
sh ./scripts/get_gesso_files.sh $drupal_root_dir $gesso_branch_tag
fi
echo "Running composer install..."
composer install --no-interaction
echo ""
echo "Done rebuilding profile."
echo ""
if [ ${build_option} = 2 ]; then
sh ./scripts/build_gesso_devel.sh $drupal_root_dir $gesso_branch_tag $gesso_root_dir
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment