3d09105ed5
Three small bugs in the legacy git-update flow that all hung off the
same never-set variable:
1. backup_install_dir was referenced in 4 files (reset_git_backup,
install_git_backup, use_git_backup, config_git_check) but DEFINED
nowhere — never has been, in any branch or tag. Resolved to "", so
"$backup_install_dir/$backupFolder" became "/backup_<ts>" (filesystem
root, perm denied). Add it to libreportalDerivePaths beside the other
roots, point it at $backup_dir/install (a sibling of restic's per-
location subdirs at $backup_dir/<idx>), and add it to initFolders so
it exists on first install.
2. gitCleanInstallBackups' find expression was
find ... -mindepth 1 -type f ! -name '*.zip' -o -type d ! -name '*.zip' -exec rm -rf {} +
`-o` binds looser than the implicit -a, so the -exec only applied to
the second clause. That meant: every non-.zip DIR anywhere under the
tree got deleted; every non-.zip FILE got matched and ignored. Even
once $backup_install_dir resolved correctly the cleanup would've
wrecked unrelated dirs.
Collapsed to `-mindepth 1 -maxdepth 1 ! -name '*.zip' -exec rm -rf {} +`
— direct children of $backup_install_dir, kill everything that isn't
a zip, let -rf take care of the dirs. Synthetic-tree smoke test
confirms only the .zip files survive.
3. use_git_backup.sh had a typo'd doubled var:
copyFolders "$backup_install_dir$backup_install_dir/$backup_file_without_zip/" ...
Reduced to the single $backup_install_dir/$backup_file_without_zip/.
All three only fire in the manual-update path (libreportal update apply
under git/local install mode); the install-blocking path is unaffected.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Signed-off-by: librelad <librelad@digitalangels.vip>
31 lines
878 B
Bash
Executable File
31 lines
878 B
Bash
Executable File
#!/bin/bash
|
|
|
|
gitUseExistingBackup()
|
|
{
|
|
isHeader "Installing LibrePortal Backup"
|
|
local backup_file="$1"
|
|
local backup_file_without_zip=$(basename "$backup_file" .zip)
|
|
update_done=false
|
|
|
|
local result=$(runInstallOp unzip -o $backup_file -d $backup_install_dir)
|
|
checkSuccess "Copy the configs to the backup folder"
|
|
|
|
gitReset;
|
|
|
|
local result=$(copyFolders "$backup_install_dir/$backup_file_without_zip/" "$docker_dir" "$sudo_user_name")
|
|
checkSuccess "Copy the backed up folders back into the installation directory"
|
|
|
|
gitCleanInstallBackups;
|
|
|
|
gitUntrackFiles;
|
|
|
|
isSuccessful "Custom changes have been discarded successfully"
|
|
|
|
echo ""
|
|
isNotice "You have restored the configuration files for LibrePortal."
|
|
isNotice "To avoid any issues please rerun the 'libreportal' command."
|
|
echo ""
|
|
exit
|
|
update_done=true
|
|
}
|