verbose configuration files

apps-disable.sh

@@ -14,14 +14,16 @@ SHIPPED_JSON="${BDIR}/../core/shipped.json"
 
 . ${BDIR}/disabled-apps.inc.sh
 
-fail() {
-	echo "${*}"
+# Log fatal error message and exit with failure code
+# Usage: log_fatal <message>
+log_fatal() {
+	echo "\033[1;31m[x] Fatal Error: ${*}\033[0m" >&2
 	exit 1
 }
 
 main() {
 	if ! which jq 2>&1 >/dev/null; then
-		fail "Error: jq is required"
+		log_fatal "jq is required"
 	fi
 
 	# alwaysEnabled should be the only attribute in this json file which really matters,

apps-enable.sh

@@ -10,27 +10,31 @@ NEXTCLOUD_DIR="${BDIR}/.."
 . ${BDIR}/enabled-core-apps.inc.sh
 . ${BDIR}/disabled-apps.inc.sh
 
-ooc() {
+execute_occ_command() {
 	php "${NEXTCLOUD_DIR}/occ" \
 		"${@}"
 }
 
-fail() {
-	echo "${*}"
+# Log fatal error message and exit with failure code
+# Usage: log_fatal <message>
+log_fatal() {
+	echo "\033[1;31m[x] Fatal Error: ${*}\033[0m" >&2
 	exit 1
 }
 
 enable_app() {
 	# Enable app and check if it was enabled
-	# Fail if enabling the app failed
+	# Return 1 if enabling the app failed, 0 if successful
 	#
 	app_name="${1}"
 	echo "Enable app '${app_name}' ..."
 
-		if ! ooc app:enable "${app_name}"
+		if ! execute_occ_command app:enable "${app_name}"
 		then
-			fail "Enabling app \"${app_name}\" failed."
+			echo "ERROR: Enabling app \"${app_name}\" failed."
+			return 1
 		fi
+		return 0
 }
 
 disable_app() {
@@ -40,9 +44,9 @@ disable_app() {
 	app_name="${1}"
 	echo "Disable app '${app_name}' ..."
 
-		if ! ooc app:disable "${app_name}"
+		if ! execute_occ_command app:disable "${app_name}"
 		then
-			fail "Disable app \"${app_name}\" failed."
+			log_fatal "Disable app \"${app_name}\" failed."
 		fi
 }
 
@@ -52,12 +56,14 @@ enable_apps() {
 	apps_dir="${1}"
 	_enabled_apps_count=0
 	_disabled_apps_count=0
+	_failed_apps_count=0
+	_failed_apps_list=""
 
 	if [ ! -d "${apps_dir}" ]; then
-		fail "Apps directory does not exist: $( readlink -f "${apps_dir}" )"
+		log_fatal "Apps directory does not exist: $( readlink -f "${apps_dir}" )"
 	fi
 
-	_enabled_apps=$(./occ app:list --enabled --output json | jq -j '.enabled | keys | join("\n")')
+	_enabled_apps=$(execute_occ_command app:list --enabled --output json | jq -j '.enabled | keys | join("\n")')
 
 	for app in $( find "${apps_dir}" -mindepth 1 -maxdepth 1 -type d | sort); do
 		app_name="$( basename "${app}" )"
@@ -81,14 +87,25 @@ enable_apps() {
 			fi
 
 			echo " - currently disabled - enabling"
-			enable_app "${app_name}"
-			_enabled_apps_count=$(( _enabled_apps_count + 1 ))
+			if enable_app "${app_name}"; then
+				_enabled_apps_count=$(( _enabled_apps_count + 1 ))
+			else
+				_failed_apps_count=$(( _failed_apps_count + 1 ))
+				if [ -z "${_failed_apps_list}" ]; then
+					_failed_apps_list="${app_name}"
+				else
+					_failed_apps_list="${_failed_apps_list}, ${app_name}"
+				fi
+			fi
 		fi
 	done
 
 	echo
 	echo "Enabled ${_enabled_apps_count} apps in ${apps_dir}"
 	echo "Disabled ${_disabled_apps_count} apps in ${apps_dir}"
+	if [ "${_failed_apps_count}" -gt 0 ]; then
+		log_fatal "PANIC: Failed to enable ${_failed_apps_count} apps in ${apps_dir}: ${_failed_apps_list}"
+	fi
 	echo
 }
 
@@ -99,7 +116,7 @@ enable_core_apps() {
 
 	echo "Check required core apps are enabled..."
 
-	disabled_apps=$(./occ app:list --disabled --output json | jq -j '.disabled | keys | join("\n")')
+	disabled_apps=$(execute_occ_command app:list --disabled --output json | jq -j '.disabled | keys | join("\n")')
 
 	if [ -z "${disabled_apps}" ]; then
 		echo "No disabled apps found."
@@ -130,7 +147,7 @@ enable_core_apps() {
 
 main() {
 	if ! jq --version 2>&1 >/dev/null; then
-		fail "Error: jq is required"
+		log_fatal "Error: jq is required"
 	fi
 
 	echo "Enable all apps in 'apps-external' folder"

configure-object-store.sh

@@ -2,8 +2,10 @@
 
 NEXTCLOUD_ROOT_DIR="/var/www/html"
 
-fail() {
-	echo "${*}" >/dev/stderr
+# Log fatal error message and exit with failure code
+# Usage: log_fatal <message>
+log_fatal() {
+	echo "\033[1;31m[x] Fatal Error: ${*}\033[0m" >/dev/stderr
 	exit 1
 }
 
@@ -52,39 +54,39 @@ main() {
 	use_path_style_value="false"
 
 	if [ ! -x "occ" ]; then
-		fail "occ command not found, are you in Nextcloud's root dir?"
+		log_fatal "occ command not found, are you in Nextcloud's root dir?"
 	fi
 
 	if [ -z "${ENC_OBJECT_STORAGE_BUCKET_NAME}" ]; then
-		fail "ENC_OBJECT_STORAGE_BUCKET_NAME not set"
+		log_fatal "ENC_OBJECT_STORAGE_BUCKET_NAME not set"
 	fi
 
 	if [ -z "${ENC_OBJECT_STORAGE_ACCESS_KEY}" ]; then
-		fail "ENC_OBJECT_STORAGE_ACCESS_KEY not set"
+		log_fatal "ENC_OBJECT_STORAGE_ACCESS_KEY not set"
 	fi
 
 	if [ -z "${ENC_OBJECT_STORAGE_SECRET}" ]; then
-		fail "ENC_OBJECT_STORAGE_SECRET not set"
+		log_fatal "ENC_OBJECT_STORAGE_SECRET not set"
 	fi
 
 	if [ -z "${ENC_OBJECT_STORAGE_REGION}" ]; then
-		fail "ENC_OBJECT_STORAGE_REGION not set"
+		log_fatal "ENC_OBJECT_STORAGE_REGION not set"
 	fi
 
 	if [ -z "${ENC_OBJECT_STORAGE_HOSTNAME}" ]; then
-		fail "ENC_OBJECT_STORAGE_HOSTNAME not set"
+		log_fatal "ENC_OBJECT_STORAGE_HOSTNAME not set"
 	fi
 
 	if [ -z "${ENC_OBJECT_STORAGE_PORT}" ]; then
-		fail "ENC_OBJECT_STORAGE_PORT not set"
+		log_fatal "ENC_OBJECT_STORAGE_PORT not set"
 	fi
 
 	if [ -n "${ENC_OBJECT_STORAGE_USE_SSL}" ] && [ "${ENC_OBJECT_STORAGE_USE_SSL}" != "true" ] && [ "${ENC_OBJECT_STORAGE_USE_SSL}" != "false" ]; then
-		fail "ENC_OBJECT_STORAGE_USE_SSL, if set should either be true or false"
+		log_fatal "ENC_OBJECT_STORAGE_USE_SSL, if set should either be true or false"
 	fi
 
 	if [ -n "${ENC_OBJECT_STORAGE_USE_PATH_STYLE}" ] && [ "${ENC_OBJECT_STORAGE_USE_PATH_STYLE}" != "true" ] && [ "${ENC_OBJECT_STORAGE_USE_PATH_STYLE}" != "false" ]; then
-		fail "ENC_OBJECT_STORAGE_USE_PATH_STYLE, if set should either be true or false"
+		log_fatal "ENC_OBJECT_STORAGE_USE_PATH_STYLE, if set should either be true or false"
 	fi
 
 	if [ "${ENC_OBJECT_STORAGE_USE_SSL}" = "false" ]; then
@@ -98,7 +100,7 @@ main() {
 	echo "Writing ${config} ..."
 
 	if ! write_config_file; then
-		fail "Error writing the object store config: ${config}"
+		log_fatal "Error writing the object store config: ${config}"
 	fi
 
 	echo "Object store config written: ${config}"

configure-user-oidc.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env sh
 
-fail() {
-	echo "${*}" >/dev/stderr
+# Log fatal error message and exit with failure code
+# Usage: log_fatal <message>
+log_fatal() {
+	echo "\033[1;31m[x] Fatal Error: ${*}\033[0m" >/dev/stderr
 	exit 1
 }
 
@@ -37,49 +39,49 @@ main() {
 	# - ENC_OIDC_SCOPES (space separated list of scopes, usually at least "openid email profile")
 
 	if [ ! -x "occ" ]; then
-		fail "occ command not found, are you in Nextcloud's root dir?"
+		log_fatal "occ command not found, are you in Nextcloud's root dir?"
 	fi
 
 	if ! jq --version 2>/dev/null 2>&1; then
-		fail "jq not found"
+		log_fatal "jq not found"
 	fi
 
 	if [ -z "${ENC_OIDC_PROVIDER_IDENTIFIER}" ]; then
-		fail "ENC_OIDC_PROVIDER_IDENTIFIER not set"
+		log_fatal "ENC_OIDC_PROVIDER_IDENTIFIER not set"
 	fi
 
 	if [ -z "${ENC_OIDC_CLIENT_ID}" ]; then
-		fail "ENC_OIDC_CLIENT_ID not set"
+		log_fatal "ENC_OIDC_CLIENT_ID not set"
 	fi
 
 	if [ -z "${ENC_OIDC_SECRET}" ]; then
-		fail "ENC_OIDC_SECRET not set"
+		log_fatal "ENC_OIDC_SECRET not set"
 	fi
 
 	if [ -z "${ENC_OIDC_DISCOVERY_URI}" ]; then
-		fail "ENC_OIDC_DISCOVERY_URI not set"
+		log_fatal "ENC_OIDC_DISCOVERY_URI not set"
 	fi
 
 	if [ -z "${ENC_OIDC_EXTRA_CLAIMS}" ]; then
-		fail "ENC_OIDC_EXTRA_CLAIMS not set"
+		log_fatal "ENC_OIDC_EXTRA_CLAIMS not set"
 	fi
 
 	if [ -z "${ENC_OIDC_MAPPING_UID}" ]; then
-		fail "ENC_OIDC_MAPPING_UID not set"
+		log_fatal "ENC_OIDC_MAPPING_UID not set"
 	fi
 
 	if [ -z "${ENC_OIDC_SCOPES}" ]; then
-		fail "ENC_OIDC_SCOPES not set"
+		log_fatal "ENC_OIDC_SCOPES not set"
 	fi
 
 	if ! configure_user_oidc; then
-		fail "Error creating provider \"${ENC_OIDC_PROVIDER_IDENTIFIER}\" with client ID \"${ENC_OIDC_CLIENT_ID}\" (occ failed)"
+		log_fatal "Error creating provider \"${ENC_OIDC_PROVIDER_IDENTIFIER}\" with client ID \"${ENC_OIDC_CLIENT_ID}\" (occ failed)"
 	fi
 
 	provider_id=$( ./occ user_oidc:provider "${ENC_OIDC_PROVIDER_IDENTIFIER}" --output=json | jq --arg "clientId" "${ENC_OIDC_CLIENT_ID}" 'select(.clientId == $clientId).id' 2>/dev/null )
 
 	if [ -z "${provider_id}" ]; then
-		fail "Error creating provider \"${ENC_OIDC_PROVIDER_IDENTIFIER}\" with client ID \"${ENC_OIDC_CLIENT_ID}\": not found"
+		log_fatal "Error creating provider \"${ENC_OIDC_PROVIDER_IDENTIFIER}\" with client ID \"${ENC_OIDC_CLIENT_ID}\": not found"
 	fi
 
 	echo "Provider \"${ENC_OIDC_PROVIDER_IDENTIFIER}\" with client ID \"${ENC_OIDC_CLIENT_ID}\" created. Provider ID: ${provider_id}"