Skip to content

Commit 0fec610

Browse files
lexsulzerlexsulzer
committed
Checking folder existence
1 parent 083ebff commit 0fec610

File tree

5 files changed

+42
-29
lines changed

5 files changed

+42
-29
lines changed

‎manage-extensions/disable-extension.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
# Public MWCLIBashScript: Disable extensions selected from $CATALOGUE_URL.
33

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

88
# https://cameronnokes.com/blog/working-with-json-in-bash-using-jq/
99
# https://edoras.sdsu.edu/doc/sed-oneliners.html
@@ -23,7 +23,7 @@
2323
if [ "$localSettings" != "null" ]; then lsInstrFound=true; fi
2424
###
2525

26-
/var/www/manage/mediawiki-cli/manage-snapshots/take-restic-snapshot.sh BeforeDisabling-$EXTNAME
26+
/var/www/manage/manage-snapshots/take-restic-snapshot.sh BeforeDisabling-$EXTNAME
2727

2828
###
2929
# Check installation aspects
@@ -53,10 +53,10 @@
5353
echo `pwd`
5454
echo $localSettings | jq -r '.[]' | while read lsLine
5555
do
56-
php /var/www/manage/mediawiki-cli/manage-config/removeFromMWMSQLite_by_name.php "$EXTNAME"
56+
php /var/www/manage/manage-config/removeFromMWMSQLite_by_name.php "$EXTNAME"
5757
done
5858
fi
5959
###
6060

61-
php /var/www/manage/mediawiki-cli/manage-config/compileMWMLocalSettings.php
61+
php /var/www/manage/manage-config/compileMWMLocalSettings.php
6262
runMWUpdatePHP

‎manage-extensions/enable-extension.sh‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Public MWCLIBashScript: Enable extensions selected from $CATALOGUE_URL.
33

44
# FIXME: handle multiple system setups
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
5+
source /var/www/manage/lib/utils.sh
6+
source /var/www/manage/manage-extensions/utils.sh
7+
source /var/www/manage/lib/permissions.sh
88

99
# https://cameronnokes.com/blog/working-with-json-in-bash-using-jq/
1010
# https://edoras.sdsu.edu/doc/sed-oneliners.html
@@ -35,13 +35,12 @@ then
3535
fi
3636
###
3737

38-
/var/www/manage/mediawiki-cli/manage-snapshots/take-restic-snapshot.sh BeforeEnabling-$EXTNAME
38+
/var/www/manage/manage-snapshots/take-restic-snapshot.sh BeforeEnabling-$EXTNAME
3939

4040
###
4141
# Run installation aspects
4242
if [ $cInstrFound ]
4343
then
44-
# CreateCampEMWCon2021: run composer correctly
4544
echo "Running composer..."
4645
# FIXME: running this removes everything from composer.json!
4746
echo $(cat /var/www/html/w/composer.local.json | jq ".require += { \"$composer\": \"$version\"}") > /var/www/html/w/composer.local.json
@@ -53,6 +52,11 @@ fi
5352
if [ $rInstrFound ]
5453
then
5554
echo "Running repository"
55+
if [ -d /var/www/html/w/extensions/$EXTNAME ]; then
56+
printf "Removing '/var/www/html/w/extensions/$EXTNAME'...\n"
57+
rm -r /var/www/html/w/extensions/$EXTNAME
58+
printf "Removed '/var/www/html/w/extensions/$EXTNAME'...\n"
59+
fi
5660
git clone $repository /var/www/html/w/extensions/$EXTNAME
5761
fi
5862
if [ $lsInstrFound ]
@@ -64,7 +68,7 @@ then
6468
do
6569
lsDirectives="$lsDirectives $lsLine"
6670
done
67-
php /var/www/manage/mediawiki-cli/manage-config/addToMWMSQLite.php "$EXTNAME" "$lsDirectives"
71+
php /var/www/manage/manage-config/addToMWMSQLite.php "$EXTNAME" "$lsDirectives"
6872
if [[ $? == 0 ]]
6973
then
7074
echo "SUCCESS: $?"
@@ -75,5 +79,5 @@ then
7579
fi
7680
###
7781

78-
php /var/www/manage/mediawiki-cli/manage-config/compileMWMLocalSettings.php
82+
php /var/www/manage/manage-config/compileMWMLocalSettings.php
7983
runMWUpdatePHP

‎manage-extensions/monitor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ function getRequireExtensions($lines) {
9090
// echo implode(", ", $extensions);
9191

9292
// PRINT
93-
printf("Highlight by adding | egrep --color -i 'what you look for'\n");
93+
printf("Highlight by adding | egrep --color -i 'what you look for|wfLoadExtensions|---'\n");
9494
printf("\n");
95-
$headers = array("w/extensions/" => $folders, "wfLoadExtensions()" => $wfLEs, "require" => $rEs, "composer.json" => $composerjsonReq, "composer.local.json" => $composerlocaljsonReq, "mwmLocalSettings.php" => $wfLEs2, "mwmconfigdb.sqlite" => $mwmLocalSettingsString, "API" => $extensions);
95+
$headers = array("0-w/extensions/" => $folders, "1-wfLoadExtensions()" => $wfLEs, "2-require" => $rEs, "3-composer.json" => $composerjsonReq, "4-composer.local.json" => $composerlocaljsonReq, "5-mwmLocalSettings.php" => $wfLEs2, "6-mwmconfigdb.sqlite" => $mwmLocalSettingsString, "7-API" => $extensions);
9696
$numberOfAddedTabs = 3;
9797
foreach($headers as $header => $variable) {
9898
printf($header.str_repeat("\t", $numberOfAddedTabs));

‎manage-extensions/tests.sh‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/bin/bash
2-
if [ "`ls /home`" != "" ] ; then source ./lib/runInContainerOnly.sh ; fi=false
3-
source ./lib/utils.sh
4-
source ./my-system.env
2+
source /var/www/manage/lib/utils.sh
53

64
specialVersionLink () {
75
printf "Check http://wiki.snoopy/wiki/Special:Version"
@@ -10,21 +8,21 @@ specialVersionLink () {
108
###############
119
# New extension
1210
ext="LabeledSectionTransclusion"
13-
./manage-extensions/enable-extension.sh $ext
11+
/var/www/manage/manage-extensions/enable-extension.sh $ext
1412
specialVersionLink
1513
promptToContinue
1614

17-
./manage-extensions/disable-extension.sh $ext
15+
/var/www/manage/manage-extensions/disable-extension.sh $ext
1816
specialVersionLink
1917
promptToContinue
2018

2119
####################
2220
# Existing extension
2321
ext="Mermaid"
24-
./manage-extensions/disable-extension.sh $ext
22+
/var/www/manage/manage-extensions/disable-extension.sh $ext
2523
specialVersionLink
2624
promptToContinue
2725

28-
./manage-extensions/enable-extension.sh $ext
26+
/var/www/manage/manage-extensions/enable-extension.sh $ext
2927
specialVersionLink
3028
promptToContinue

‎manage-snapshots/take-restic-snapshot.sh‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,19 @@ fi
88

99
TAG=$1
1010
printf "Taking snapshot '$TAG'...\n"
11-
12-
mkdir /var/www/currentsnapshot
11+
currentsnapshotFolder="/var/www/currentsnapshot"
12+
if [ -d $currentsnapshotFolder ]; then
13+
printf "Emptying '$currentsnapshotFolder'...\n"
14+
rm -r $currentsnapshotFolder/*
15+
printf "Emptied '$currentsnapshotFolder'...\n"
16+
else
17+
mkdir $currentsnapshotFolder
18+
fi
1319

1420
######
1521
# STEP 1: Dump content database
1622
mysqldump -h $MYSQL_HOST -u $MYSQL_USER -p$MYSQL_PASSWORD \
17-
$DATABASE_NAME > /var/www/currentsnapshot/db.sql
23+
$DATABASE_NAME > $currentsnapshotFolder/db.sql
1824
printf "mysqldump mediawiki completed.\n"
1925

2026
######
@@ -28,12 +34,17 @@ cp -r \
2834
/var/www/html/w/vendor \
2935
/var/www/config/mwmconfigdb.sqlite \
3036
/var/www/config/mwmLocalSettings.php \
31-
/var/www/currentsnapshot
37+
$currentsnapshotFolder
3238

3339
printf "copy folders and files completed.\n"
3440

3541
######
3642
# STEP 3: Run restic backup
37-
restic -r s3:$AWS_S3_API/$AWS_S3_BUCKET --tag $TAG \
38-
backup /var/www/currentsnapshot
39-
printf "completed running restic backup.\n"
43+
# restic -r s3:$AWS_S3_API/$AWS_S3_BUCKET --tag $TAG \
44+
# backup $currentsnapshotFolder
45+
printf "completed running restic backup.\n"
46+
47+
# FIXME: How to handle:
48+
# Fatal: unable to open config file: Stat: Get http://192.168.1.36:9000/snoopy-mediawiki0/?location=: dial tcp 192.168.1.36:9000: i/o timeout
49+
# Is there a repository at the following location?
50+
# s3:http://192.168.1.36:9000/snoopy-mediawiki0

0 commit comments

Comments
 (0)