Ready to factor out sudo

Author: lexsulzer

check-and-complete-environment.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-if $DEBUG ; then echo "RUN LEX2110071928" ; fi
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110071928" ; fi
 
 sudo apt update
 

config-db/lib.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080655" ; fi
+
 export mwmLocalSettings="mwmLocalSettings.php"
 
 initializemwmLocalSettings() {
@@ -9,9 +11,9 @@ initializemwmLocalSettings() {
 
 export -f initializemwmLocalSettings
 
-compilemwmLocalSettings() {
+compileMWMLocalSettings() {
     $CONTAINER_COMMAND exec $MEDIAWIKI_CONTAINER_NAME /bin/bash -c "php $MEDIAWIKI_CLI_IN_CONTAINER/lib/compileMWMLocalSettings.php"
     writeToSystemLog "Recompiled $mwmLocalSettings"
 }
 
-export -f compilemwmLocalSettings
+export -f compileMWMLocalSettings

config-db/view-mwm-config.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Public MWCLIBashScript: Check which PHP directives are currently added to LocalSettings.php.
 source ./my-system.env
-if $DEBUG ; then echo "RUN LEX2110080553" ; fi
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080553" ; fi
 
 printf "\n\033[0;32m\e[1mMWCLI Config\033[0m"
 printf "\n============\n"

enter-mediawiki-container.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Public MWMBashScript: Check out primary system aspects.
+clear;
+set -a
+    source ./my-system.env
+set +a
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080738" ; fi
+
+$CONTAINER_COMMAND exec --env-file=./my-system.env \
+    $MEDIAWIKI_CONTAINER_NAME \
+    /bin/bash

initialize-mwcliconfigdb.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 # Public MWMBashScript:
+
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080657" ; fi
+
 echo $MWCLI_CONFIG_DB_ON_HOSTING_SYSTEM
 sqlite3 $MWCLI_CONFIG_DB_ON_HOSTING_SYSTEM "CREATE TABLE IF NOT EXISTS extensions (
     id INTEGER PRIMARY KEY AUTOINCREMENT,

lib/permissions.sh

@@ -2,6 +2,8 @@
 
 # CreateCampEMWCon2021: Check general permissions
 
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080658" ; fi
+
 setPermissionsOnSystemInstanceRoot () {
 
     dir=$MWCLI_SYSTEM_LOG_ON_HOSTING_SYSTEM

lib/runInContainerOnly.sh

@@ -2,14 +2,14 @@
 
 # CreateCampEMWCon2021: https://mwstake.org/mwstake/wiki/MWStake_MediaWiki_Manager/Infrastructure
 source ./my-system.env
-if $DEBUG ; then echo "RUN LEX2110080554" ; fi
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080554" ; fi
 
 if [ "`ls /home`" != "" ]
 then
-    if $DEBUG ; then echo "RUN LEX2110080556 in $MEDIAWIKI_CONTAINER_NAME:$MEDIAWIKI_CLI_IN_CONTAINER" ; fi
+    if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080556 in $MEDIAWIKI_CONTAINER_NAME:$MEDIAWIKI_CLI_IN_CONTAINER" ; fi
 
     # source ./lib/utils.sh
-    if $DEBUG ; then printf "INFO: \x1b[31mredirecting run command to \033[1m$CONTAINER_COMMAND exec $MEDIAWIKI_CONTAINER_NAME $MEDIAWIKI_CLI_IN_CONTAINER/`dirname $0`/`basename $0` "$1"\n" ; fi
+    if [ -n "$DEBUG" ] ; then printf "INFO: \x1b[31mredirecting run command to \033[1m$CONTAINER_COMMAND exec $MEDIAWIKI_CONTAINER_NAME $MEDIAWIKI_CLI_IN_CONTAINER/`dirname $0`/`basename $0` "$1"\n" ; fi
 
     $CONTAINER_COMMAND exec --env-file=./my-system.env $MEDIAWIKI_CONTAINER_NAME /bin/bash -c "$MEDIAWIKI_CLI_IN_CONTAINER/`dirname $0`/`basename $0` $1"
     exit

lib/utils.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080657" ; fi
+
 # Public MWCLIBashFunction
 promptToContinue () {
     printf "\n\n\e[2m"

logging/lib.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080656" ; fi
+
 # Public MWCLIBashFunction
 initializeSystemLog () {
     FILE=$MWCLI_SYSTEM_LOG_ON_HOSTING_SYSTEM/system.log

manage-extensions/utils.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CATALOGUE_URL=https://raw.githubusercontent.com/dataspects/mediawiki-manager/main/catalogues/extensions.json
+CATALOGUE_URL=https://raw.githubusercontent.com/dataspects/mediawiki-installer/main/catalogues/extensions.json
 
 # https://cameronnokes.com/blog/working-with-json-in-bash-using-jq/
 

manage-system/show-composerLocalJSON.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Public MWCLIBashScript: Check the current contents of $SYSTEM_ROOT_FOLDER_ON_HOSTING_SYSTEM/w/composer.local.json.
 source ./my-system.env
-if $DEBUG ; then echo "RUN LEX2110080607" ; fi
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080607" ; fi
 
 
 printf "\n\033[0;32m\e[1mcomposer.local.json\033[0m"

manage-system/upgrade.sh

@@ -13,8 +13,8 @@ read MEDIAWIKI_IMAGE
 ./manage-system/stop.sh
 $CONTAINER_COMMAND pod rm mwcli-deployment-pod-0
 
-envsubst < mediawiki-manager.tpl > mediawiki-manager.yml
-$CONTAINER_COMMAND play kube mediawiki-manager.yml
+envsubst < mediawiki-installer.tpl > mediawiki-installer.yml
+$CONTAINER_COMMAND play kube mediawiki-installer.yml
 
 ./system-snapshots/restore-restic-snapshot.sh latest
 

my-system.env

@@ -1,8 +1,7 @@
-DEBUG=false
 
 LOCALUSER=dserver
 MEDIAWIKI_CLI_IN_CONTAINER=/var/www/html/cli
-APACHE_CONF_ON_HOSTING_SYSTEM="/home/$LOCALUSER/mediawiki-manager/conf/apache/sites-available"
+APACHE_CONF_ON_HOSTING_SYSTEM="/home/$LOCALUSER/mediawiki-installer/conf/apache/sites-available"
 APACHE_CONF_IN_CONTAINER=/etc/apache2/sites-available
 MEDIAWIKI_CONTAINER_NAME=mwm-deployment-pod-0-mediawiki
 

report-status.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 # Public MWMBashScript: Check out primary system aspects.
 clear;
-source ./my-system.env
-if $DEBUG ; then echo "RUN LEX2110080552" ; fi
+set -a
+    source ./my-system.env
+set +a
+if [ -n "$DEBUG" ] ; then echo "RUN LEX2110080552" ; fi
 
 ./config-db/view-mwm-config.sh
 ./manage-system/show-composerLocalJSON.sh