Skip to content

Commit dd09ae8

Browse files
lexsulzerlexsulzer
committed
Rearranged
1 parent e8128e6 commit dd09ae8

19 files changed

+79
-81
lines changed

‎add-to-mwm-config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ source ./my-system.env
44

55
if [ "`ls /home`" != "" ] ; then source ./lib/runInContainerOnly.sh ; fi
66

7-
"php $MEDIAWIKI_CLI_IN_CONTAINER/lib/addToMWMSQLite.php \"ls\" \"
7+
"php /var/www/manage/mediawiki-cli/lib/addToMWMSQLite.php \"ls\" \"
88
\\\$wgServer = 'https://p51:4443';
99
\""

‎shared/initialize-database.sh renamed to ‎install/initialize-database.sh

File renamed without changes.

‎lib/test-updateMWMLocalSettings.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ if [ "`ls /home`" != "" ] ; then source ./lib/runInContainerOnly.sh ; fi
33
source ./lib/utils.sh
44

55

6-
php ./lib/updatemwmLocalSettings.php
6+
php /var/www/manage/mediawiki-cli/manage-config/updatemwmLocalSettings.php

‎shared/waitForMariaDB.sh renamed to ‎lib/waitForMariaDB.sh

File renamed without changes.

‎shared/maintenance-update.php.sh renamed to ‎maintenance/maintenance-update.php.sh

File renamed without changes.

‎shared/addToMWMSQLite.php renamed to ‎manage-config/addToMWMSQLite.php

File renamed without changes.

‎shared/compileMWMLocalSettings.php renamed to ‎manage-config/compileMWMLocalSettings.php

File renamed without changes.

‎shared/initialize-mwcliconfigdb.sh renamed to ‎manage-config/initialize-mwcliconfigdb.sh

File renamed without changes.

‎shared/removeFromMWMSQLite.php renamed to ‎manage-config/removeFromMWMSQLite.php

File renamed without changes.

‎shared/view-mwm-config.php renamed to ‎manage-config/view-mwm-config.php

File renamed without changes.

‎manage-extensions/check-extensions-diff.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
source ./lib/utils.sh
3+
source /var/www/manage/mediawiki-cli/lib/utils.sh
44

55
printf "Comparing system_root/w/extensions/ <<<>>> existing_version/extensions/\n\n"
66
diff --brief \

‎manage-extensions/disable-extension.sh

+54-54
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
1-
#!/bin/bash
2-
# Public MWCLIBashScript: Disable extensions selected from $CATALOGUE_URL.
1+
#!/bin/bash
2+
# Public MWCLIBashScript: Disable extensions selected from $CATALOGUE_URL.
33

4-
if [ "`ls /home`" != "" ] ; then source ./lib/runInContainerOnly.sh ; fi
4+
if [ "`ls /home`" != "" ] ; then source ./lib/runInContainerOnly.sh ; fi
55

6-
# FIXME: handle multiple system setups
7-
source ./manage-extensions/utils.sh
8-
source ./lib/utils.sh
9-
source ./lib/permissions.sh
6+
# FIXME: handle multiple system setups
7+
source ./manage-extensions/utils.sh
8+
source ./lib/utils.sh
9+
source ./lib/permissions.sh
1010

11-
# https://cameronnokes.com/blog/working-with-json-in-bash-using-jq/
12-
# https://edoras.sdsu.edu/doc/sed-oneliners.html
11+
# https://cameronnokes.com/blog/working-with-json-in-bash-using-jq/
12+
# https://edoras.sdsu.edu/doc/sed-oneliners.html
1313

1414

15-
EXTNAME=$1
15+
EXTNAME=$1
1616

17-
###
18-
# Collect installation aspects
19-
getExtensionData $EXTNAME
20-
installationAspects=`getExtensionDataByKey "installation-aspects" "$extensionData"`
21-
composer=`getExtensionDataByKey "composer" "$installationAspects"`
22-
repository=`getExtensionDataByKey "repository" "$installationAspects"`
23-
localSettings=`getExtensionDataByKey "localsettings" "$installationAspects"`
24-
if [ "$composer" != "null" ]; then cInstrFound=true; fi
25-
if [ "$repository" != "null" ]; then rInstrFound=true; fi
26-
if [ "$localSettings" != "null" ]; then lsInstrFound=true; fi
27-
###
17+
###
18+
# Collect installation aspects
19+
getExtensionData $EXTNAME
20+
installationAspects=`getExtensionDataByKey "installation-aspects" "$extensionData"`
21+
composer=`getExtensionDataByKey "composer" "$installationAspects"`
22+
repository=`getExtensionDataByKey "repository" "$installationAspects"`
23+
localSettings=`getExtensionDataByKey "localsettings" "$installationAspects"`
24+
if [ "$composer" != "null" ]; then cInstrFound=true; fi
25+
if [ "$repository" != "null" ]; then rInstrFound=true; fi
26+
if [ "$localSettings" != "null" ]; then lsInstrFound=true; fi
27+
###
2828

29-
./system-snapshots/take-restic-snapshot.sh BeforeDisabling-$EXTNAME
29+
./system-snapshots/take-restic-snapshot.sh BeforeDisabling-$EXTNAME
3030

31-
###
32-
# Check installation aspects
33-
if [ $cInstrFound ] && [ $rInstrFound ]
34-
then
35-
echo "Problem: Installation aspects for $EXTNAME contain both composer and repository specifications!"
36-
exit
37-
fi
31+
###
32+
# Check installation aspects
33+
if [ $cInstrFound ] && [ $rInstrFound ]
34+
then
35+
echo "Problem: Installation aspects for $EXTNAME contain both composer and repository specifications!"
36+
exit
37+
fi
3838

39-
###
40-
# Run installation aspects
41-
if [ $cInstrFound ]
42-
then
43-
echo "Running composer..."
44-
cd $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w && COMPOSER=composer.local.json COMPOSER_HOME=$SYSTEM_ROOT_FOLDER_IN_CONTAINER/w php composer.phar remove $composer
45-
cd -
46-
echo "Ran composer"
47-
fi
48-
if [ $rInstrFound ]
49-
then
50-
echo "Running repository"
51-
fi
52-
if [ $lsInstrFound ]
53-
then
54-
echo "Running localsettings"
55-
echo `pwd`
56-
echo $localSettings | jq -r '.[]' | while read lsLine
57-
do
58-
php ./lib/removeFromMWCLISQLite.php "$EXTNAME"
59-
done
60-
fi
61-
###
39+
###
40+
# Run installation aspects
41+
if [ $cInstrFound ]
42+
then
43+
echo "Running composer..."
44+
cd /var/www/html/w && COMPOSER=composer.local.json COMPOSER_HOME=/var/www/html/w php composer.phar remove $composer
45+
cd -
46+
echo "Ran composer"
47+
fi
48+
if [ $rInstrFound ]
49+
then
50+
echo "Running repository"
51+
fi
52+
if [ $lsInstrFound ]
53+
then
54+
echo "Running localsettings"
55+
echo `pwd`
56+
echo $localSettings | jq -r '.[]' | while read lsLine
57+
do
58+
php /var/www/manage/mediawiki-cli/manage-config/removeFromMWCLISQLite.php "$EXTNAME"
59+
done
60+
fi
61+
###
6262

63-
php ./lib/updatemwmLocalSettings.php
64-
runMWUpdatePHP
63+
php /var/www/manage/mediawiki-cli/manage-config/updatemwmLocalSettings.php
64+
runMWUpdatePHP

‎manage-extensions/enable-extension.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
#!/bin/bash
22
# Public MWCLIBashScript: Enable extensions selected from $CATALOGUE_URL.
33

4-
if [ "`ls /home`" != "" ] ; then source ./lib/runInContainerOnly.sh ; fi
5-
64
# FIXME: handle multiple system setups
7-
source $MEDIAWIKI_CLI_IN_CONTAINER/lib/utils.sh
8-
source $MEDIAWIKI_CLI_IN_CONTAINER/manage-extensions/utils.sh
9-
source $MEDIAWIKI_CLI_IN_CONTAINER/lib/permissions.sh
5+
source /var/www/manage/mediawiki-cli/lib/utils.sh
6+
source /var/www/manage/mediawiki-cli/manage-extensions/utils.sh
7+
source /var/www/manage/mediawiki-cli/lib/permissions.sh
108

119
# https://cameronnokes.com/blog/working-with-json-in-bash-using-jq/
1210
# https://edoras.sdsu.edu/doc/sed-oneliners.html
@@ -36,15 +34,15 @@ then
3634
fi
3735
###
3836

39-
$MEDIAWIKI_CLI_IN_CONTAINER/system-snapshots/take-restic-snapshot.sh BeforeEnabling-$EXTNAME
37+
/var/www/manage/mediawiki-cli/system-snapshots/take-restic-snapshot.sh BeforeEnabling-$EXTNAME
4038

4139
###
4240
# Run installation aspects
4341
if [ $cInstrFound ]
4442
then
4543
# CreateCampEMWCon2021: run composer correctly
4644
echo "Running composer..."
47-
cd $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w && COMPOSER=composer.local.json COMPOSER_HOME=$SYSTEM_ROOT_FOLDER_IN_CONTAINER/w php composer.phar require $composer
45+
cd /var/www/html/w && COMPOSER=composer.local.json COMPOSER_HOME=/var/www/html/w php composer.phar require $composer
4846
cd -
4947
echo "Ran composer"
5048
fi
@@ -63,7 +61,7 @@ then
6361
do
6462
lsDirectives="$lsDirectives $lsLine"
6563
done
66-
php $MEDIAWIKI_CLI_IN_CONTAINER/lib/addToMWCLISQLite.php "$EXTNAME" "$lsDirectives"
64+
php /var/www/manage/mediawiki-cli/lib/addToMWCLISQLite.php "$EXTNAME" "$lsDirectives"
6765
if [[ $? == 0 ]]
6866
then
6967
echo "SUCCESS: $?"
@@ -74,5 +72,5 @@ then
7472
fi
7573
###
7674

77-
php $MEDIAWIKI_CLI_IN_CONTAINER/lib/updatemwmLocalSettings.php
75+
php /var/www/manage/mediawiki-cli/manage-config/updatemwmLocalSettings.php
7876
runMWUpdatePHP

‎manage-extensions/show-extension-catalogue.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22
# Public MWCLIBashScript: Show extensions featured in $CATALOGUE_URL.
33

4-
source ./lib/utils.sh
5-
source ./manage-extensions/utils.sh
4+
source /var/www/manage/mediawiki-cli/lib/utils.sh
5+
source /var/www/manage/mediawiki-cli/manage-extensions/utils.sh
66

77
getExtensionJSON
88
printf "\n\033[0;32m\e[1mMWStake Certified Extensions Catalog\033[0m"

‎shared/initialize-restic.sh renamed to ‎manage-snapshots/initialize-restic.sh

File renamed without changes.

‎shared/restore-restic-snapshot.sh renamed to ‎manage-snapshots/restore-restic-snapshot.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ restic -r s3:$AWS_S3_API/$AWS_S3_BUCKET \
1717
restore $SNAPSHOT_ID \
1818
--target /var/www/restoresnapshot
1919

20-
# cp $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/composer.local.json $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w/composer.local.json; \
21-
# cp $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/composer.local.lock $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w/composer.local.lock; \
20+
# cp $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/composer.local.json /var/www/html/w/composer.local.json; \
21+
# cp $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/composer.local.lock /var/www/html/w/composer.local.lock; \
2222
# cp $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/mwmconfigdb.sqlite /var/www/config/mwmconfigdb.sqlite; \
23-
# rm -rf $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w/extensions/*;
24-
# cp -r --preserve=links $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/extensions/* $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w/extensions/; \
25-
# rm -rf $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w/skins/*;
26-
# cp -r --preserve=links $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/skins/* $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w/skins/; \
27-
# rm -rf $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w/images/*;
28-
# cp -r --preserve=links $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/images/* $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w/images/; \
29-
# rm -rf $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w/vendor/*;
30-
# cp -r --preserve=links $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/vendor/* $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w/vendor/; \
23+
# rm -rf /var/www/html/w/extensions/*;
24+
# cp -r --preserve=links $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/extensions/* /var/www/html/w/extensions/; \
25+
# rm -rf /var/www/html/w/skins/*;
26+
# cp -r --preserve=links $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/skins/* /var/www/html/w/skins/; \
27+
# rm -rf /var/www/html/w/images/*;
28+
# cp -r --preserve=links $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/images/* /var/www/html/w/images/; \
29+
# rm -rf /var/www/html/w/vendor/*;
30+
# cp -r --preserve=links $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/vendor/* /var/www/html/w/vendor/; \
3131
# rm -rf /etc/apache2/sites-available/*;
3232
# cp -r --preserve=links $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/sites-available/* /etc/apache2/sites-available/;
3333

3434
# mysql -h $MYSQL_HOST -u $MYSQL_USER -p$MYSQL_PASSWORD \
3535
# $DATABASE_NAME < $CURRENT_RESOURCES_IN_CONTAINER/var/www/html/currentresources/db.sql
3636

37-
# php $MEDIAWIKI_CLI_IN_CONTAINER/lib/updatemwmLocalSettings.php
38-
# cd $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w && COMPOSER_HOME=$SYSTEM_ROOT_FOLDER_IN_CONTAINER/w php composer.phar update
37+
# php /var/www/manage/mediawiki-cli/manage-config/updatemwmLocalSettings.php
38+
# cd /var/www/html/w && COMPOSER_HOME=/var/www/html/w php composer.phar update
3939
# cd -

‎shared/take-restic-snapshot.sh renamed to ‎manage-snapshots/take-restic-snapshot.sh

File renamed without changes.

‎shared/view-restic-snapshots.sh renamed to ‎manage-snapshots/view-restic-snapshots.sh

File renamed without changes.

‎start-stop/upgrade.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ $MEDIAWIKI_CLI/system-snapshots/restore-restic-snapshot.sh latest
2121
source $MEDIAWIKI_CLI/lib/waitForMariaDB.sh
2222

2323
source ./my-system.env
24-
$CONTAINER_COMMAND exec $APACHE_CONTAINER_NAME /bin/bash -c "cd $SYSTEM_ROOT_FOLDER_IN_CONTAINER/w && COMPOSER_HOME=$SYSTEM_ROOT_FOLDER_IN_CONTAINER/w php composer.phar update"
24+
$CONTAINER_COMMAND exec $APACHE_CONTAINER_NAME /bin/bash -c "cd /var/www/html/w && COMPOSER_HOME=/var/www/html/w php composer.phar update"
2525

2626
runMWUpdatePHP

0 commit comments

Comments
 (0)