From 0e9e54e6391ec3596a6b9a80918610a2e1d83227 Mon Sep 17 00:00:00 2001 From: darta Date: Mon, 31 Jan 2022 18:50:59 +0000 Subject: [PATCH] fix(dd-ctl): mu-plugins with git --- dd-ctl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dd-ctl b/dd-ctl index ad5a706..948efa1 100755 --- a/dd-ctl +++ b/dd-ctl @@ -230,11 +230,11 @@ setup_wordpress(){ ## Multisite docker exec -ti isard-apps-wordpress /bin/sh -c "/multisite.sh" - # docker exec -ti isard-apps-wordpress /bin/sh -c "if [ ! -d /var/www/html/wp-content/plugins/saml/onelogin-saml-sso ]; then cp -R /plugins/saml/onelogin-saml-sso /var/www/html/wp-content/plugins/; fi" + #docker exec -ti isard-apps-wordpress /bin/sh -c "if [ ! -d /var/www/html/wp-content/plugins/saml/onelogin-saml-sso ]; then cp -R /plugins/saml/onelogin-saml-sso /var/www/html/wp-content/plugins/; fi" # docker exec -ti isard-apps-wordpress /bin/sh -c "if [ ! -d /var/www/html/wp-content/mu-plugins ]; then cp -R /plugins/mu-plugins /var/www/html/wp-content/; fi" docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin install onelogin-saml-sso --activate' - docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin install generateblocks --activate' - docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp theme install generatepress --activate' + docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin install generateblocks --activate' + docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp theme install generatepress --activate' # docker-compose run isard-apps-wordpress-cli /bin/bash -c 'wp plugin activate onelogin-saml-sso --network' } @@ -407,11 +407,15 @@ upgrade_plugins_nextcloud(){ } upgrade_plugins_wp(){ -## MU-PLUGINS WP if [ ! -d $SRC_FOLDER/wordpress/wp-content/mu-plugins ]; then - git clone https://gitlab.com/muplugins-multiste1/muplugins-google-sites $SRC_FOLDER/wordpress/wp-content/mu-plugins + git clone https://gitlab.com/muplugins-multiste1/muplugins-google-sites.git $SRC_FOLDER/wordpress/wp-content/mu-plugins + fi + if [ ! -d $SRC_FOLDER/wordpress/wp-content/mu-plugins/.git ]; then + echo "WARNING: /opt/digitaldemocratic/src/wordpress/wp-content/mu-plugins is not a git repository." + echo " This could be due to old installation. To bring all new mu-plugins code for WP" + echo " remove that folder and it will be cloned and mantained with git from now on." else - git pull $SRC_FOLDER/wordpress/wp-content/mu-plugins + sh -c "cd $SRC_FOLDER/wordpress/wp-content/mu-plugins; git pull" fi docker-compose run --user=root isard-apps-wordpress-cli /bin/bash -c 'chown -R 33:33 /var/www/html/wp-content/mu-plugins;' }