Webstar/LibrePortal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge claude/1

Browse Source
This commit is contained in:
librelad 2026-05-24 17:05:37 +01:00
commit 2826acf880
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/update/backup/install_git_backup.sh
View File

@ -2,8 +2,8 @@
gitCleanInstallBackups()
{
local result=$(sudo find "$backup_install_dir" -mindepth 1 -type f ! -name '*.zip' -o -type d ! -name '*.zip' -exec sudo rm -rf {} +)
local result=$(runInstallOp find "$backup_install_dir" -mindepth 1 -type f ! -name '*.zip' -o -type d ! -name '*.zip' -exec rm -rf {} +)
checkSuccess "Cleaning up install backup folders."
local result=$(cd "$backup_install_dir" && sudo find . -maxdepth 1 -type f -name '*.zip' | sudo xargs ls -t | tail -n +6 | sudo xargs -r rm)
local result=$(cd "$backup_install_dir" && find . -maxdepth 1 -type f -name '*.zip' | xargs ls -t | tail -n +6 | xargs -r rm)
checkSuccess "Deleting old install backup and keeping the latest 5."
}

2
scripts/update/backup/use_git_backup.sh
View File

@ -7,7 +7,7 @@ gitUseExistingBackup()
local backup_file_without_zip=$(basename "$backup_file" .zip)
update_done=false
local result=$(sudo unzip -o $backup_file -d $backup_install_dir)
local result=$(runInstallOp unzip -o $backup_file -d $backup_install_dir)
checkSuccess "Copy the configs to the backup folder"
gitReset;

6
scripts/update/git/checks/config_git_check.sh
View File

@ -7,7 +7,7 @@ gitCheckConfigs()
local valid_configs_found=false
# Get a list of all backup zip files in the directory, sorted by date (latest first)
local backup_files=($(sudo find "$backup_install_dir" -type f -name 'backup_*.zip' | sort -r))
local backup_files=($(runInstallOp find "$backup_install_dir" -type f -name 'backup_*.zip' | sort -r))
# Check if any backup files were found
if [ ${#backup_files[@]} -eq 0 ]; then
@ -43,9 +43,9 @@ gitCheckConfigs()
unzip -q "$zip_file" -d "$temp_dir"
# Find the path of config files within the extracted files (new structure only)
local config_file_path=$(sudo find "$temp_dir" -type f -path "*/general/basic_settings" | head -1)
local config_file_path=$(runInstallOp find "$temp_dir" -type f -path "*/general/basic_settings" | head -1)
if [ -z "$config_file_path" ]; then
config_file_path=$(sudo find "$temp_dir" -type f -path "*/general/git_config" | head -1)
config_file_path=$(runInstallOp find "$temp_dir" -type f -path "*/general/git_config" | head -1)
fi
# Check if config file exists and does not contain "Change-Me"