From 1e26d001bd79241807000d7e236933e588838f2f Mon Sep 17 00:00:00 2001 From: MichaIng Date: Fri, 20 Jan 2023 11:57:22 +0100 Subject: [PATCH] v8.14 - DietPi-Software | ownCloud/Nextcloud: Resolved an issue where a global software password with dashes lead to a failing install. Many thanks to @maxmoonshark for reporting this issue: https://github.com/MichaIng/DietPi/issues/4199 --- CHANGELOG.txt | 1 + dietpi/dietpi-software | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cb45bd0e79..140d064a46 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,7 @@ Enhancements: Bug fixes: - DietPi-Software | Docker: Resolved a v8.13 regression where Docker dependants (Portainer, Roon Extension Manager) failed to install as the Docker socket was not activated. Many thanks to @omavoss for reporting this issue: https://github.com/MichaIng/DietPi/issues/6065 +- DietPi-Software | ownCloud/Nextcloud: Resolved an issue where a global software password with dashes lead to a failing install. Many thanks to @maxmoonshark for reporting this issue: https://github.com/MichaIng/DietPi/issues/4199 As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/XXXX diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software index d99df17e4e..f29e06ca73 100755 --- a/dietpi/dietpi-software +++ b/dietpi/dietpi-software @@ -4356,7 +4356,7 @@ The install script will now exit. After applying one of the the above, rerun die G_EXEC_PRE_FUNC(){ acommand[10]=$oc_password acommand[14]=$GLOBAL_PW; } # - Checking output for stack trace to handle internal errors that do not lead to php error exit code G_EXEC_POST_FUNC(){ grep -qi 'Stack trace' "$fp_log" && exit_code=255; } - G_EXEC occ maintenance:install --no-interaction --database 'mysql' --database-name 'owncloud' --database-user 'tmp_root' --database-pass "${oc_password//?/X}" --admin-user "$username" --admin-pass "${GLOBAL_PW//?/X}" --data-dir "$datadir" + G_EXEC occ maintenance:install --no-interaction --database='mysql' --database-name='owncloud' --database-user='tmp_root' --database-pass="${oc_password//?/X}" --admin-user="$username" --admin-pass="${GLOBAL_PW//?/X}" --data-dir="$datadir" G_EXEC mysql -e 'drop user tmp_root@localhost;' unset -v oc_password @@ -4616,7 +4616,7 @@ The install script will now exit. After applying one of the the above, rerun die fi } - G_EXEC ncc maintenance:install --no-interaction --database 'mysql' --database-name 'nextcloud' --database-user 'tmp_root' --database-pass "${nc_password//?/X}" --admin-user "$username" --admin-pass "${GLOBAL_PW//?/X}" --data-dir "$datadir" + G_EXEC ncc maintenance:install --no-interaction --database='mysql' --database-name='nextcloud' --database-user='tmp_root' --database-pass="${nc_password//?/X}" --admin-user="$username" --admin-pass="${GLOBAL_PW//?/X}" --data-dir="$datadir" G_EXEC mysql -e 'drop user tmp_root@localhost;' unset -v nc_password