gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-17 03:04:46 +08:00
Code

fix: 解决应用备份或升级失败的问题 (#1306)

Browse Source
This commit is contained in:
ssongliu 2023-06-09 11:42:11 +08:00 committed by GitHub
parent 8f036a0c3d
commit 7c600a357c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/service/backup_app.go
View File

@ -99,7 +99,7 @@ func handleAppBackup(install *model.AppInstall, backupDir, fileName string) erro
return err return err
} }
appPath := fmt.Sprintf("%s/%s", install.GetPath(), install.Name) appPath := install.GetPath()
if err := handleTar(appPath, tmpDir, "app.tar.gz", ""); err != nil { if err := handleTar(appPath, tmpDir, "app.tar.gz", ""); err != nil {
return err return err
} }

2
backend/app/service/cronjob_helper.go
View File

@ -196,7 +196,7 @@ func handleTar(sourceDir, targetDir, name, exclusionRules string) error {
path := "" path := ""
if strings.Contains(sourceDir, "/") { if strings.Contains(sourceDir, "/") {
itemDir := strings.ReplaceAll(sourceDir[strings.LastIndex(sourceDir, "/"):], "/", "") itemDir := strings.ReplaceAll(sourceDir[strings.LastIndex(sourceDir, "/"):], "/", "")
aheadDir := strings.ReplaceAll(sourceDir, itemDir, "") aheadDir := sourceDir[:strings.LastIndex(sourceDir, "/")]
path += fmt.Sprintf("-C %s %s", aheadDir, itemDir) path += fmt.Sprintf("-C %s %s", aheadDir, itemDir)
} else { } else {
path = sourceDir path = sourceDir