mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
bullseye->bookworm: fix the /var/log/yunohost/operations folder migration, in particular because the new folder will already exist when this code is triggered after the bullseye->bookworm (because 'yunohost tools regen-conf' will create a file in the new folder before actually ariving at this code) so we can't just rely on testing wether or not the new folder exists
This commit is contained in:
parent
9a0960dcf1
commit
6453d15011
1 changed files with 9 additions and 2 deletions
|
@ -300,9 +300,16 @@ do_post_regen() {
|
|||
base_folder_and_perm_init
|
||||
|
||||
# Legacy log tree structure
|
||||
if [ ! -e /var/log/yunohost/operations ] && [ -d /var/log/yunohost/categories/operation ] && [ ! -L /var/log/yunohost/categories/operation ]
|
||||
if [ ! -e /var/log/yunohost/operations ]
|
||||
then
|
||||
mv /var/log/yunohost/categories/operation /var/log/yunohost/operations
|
||||
mkdir -p /var/log/yunohost/operations
|
||||
fi
|
||||
if [ -d /var/log/yunohost/categories/operation ] && [ ! -L /var/log/yunohost/categories/operation ]
|
||||
then
|
||||
# (we use find -type f instead of mv /folder/* to make sure to also move hidden files which are not included in globs by default)
|
||||
find /var/log/yunohost/categories/operation/ -type f -print0 | xargs -0 -I {} mv {} /var/log/yunohost/operations/
|
||||
# Attempt to delete the old dir (because we want it to be a symlink) or just rename it if it can't be removed (not empty) for some reason
|
||||
rmdir /var/log/yunohost/categories/operation || mv /var/log/yunohost/categories/operation /var/log/yunohost/categories/operation.old
|
||||
ln -s /var/log/yunohost/operations /var/log/yunohost/categories/operation
|
||||
fi
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue