1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-12-19 22:09:03 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix the issue of abnormal 1pctl language display after upgrade (#10533)

Browse source
This commit is contained in:
ssongliu 2025-09-29 14:18:50 +08:00 • committed by GitHub
parent 4eb264bea4
commit 3675c2f3f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/app/service/upgrade.go
View file

@ -70,6 +70,9 @@ func (u *UpgradeService) SearchUpgrade() (*dto.UpgradeInfo, error) {
if strings.Contains(itemVersion, "beta") { if strings.Contains(itemVersion, "beta") {
mode = "beta" mode = "beta"
} }
if strings.HasPrefix(upgrade.TestVersion, upgrade.LatestVersion+"-beta") {
upgrade.TestVersion = ""
}
notes, err := u.loadReleaseNotes(fmt.Sprintf("%s/%s/%s/release/1panel-%s-release-notes", global.CONF.RemoteURL.RepoUrl, mode, itemVersion, itemVersion)) notes, err := u.loadReleaseNotes(fmt.Sprintf("%s/%s/%s/release/1panel-%s-release-notes", global.CONF.RemoteURL.RepoUrl, mode, itemVersion, itemVersion))
if err != nil { if err != nil {
return nil, fmt.Errorf("load releases-notes of version %s failed, err: %v", itemVersion, err) return nil, fmt.Errorf("load releases-notes of version %s failed, err: %v", itemVersion, err)
@ -115,6 +118,7 @@ func (u *UpgradeService) Upgrade(req dto.Upgrade) error {
fileName := fmt.Sprintf("1panel-%s-%s-%s.tar.gz", req.Version, "linux", itemArch) fileName := fmt.Sprintf("1panel-%s-%s-%s.tar.gz", req.Version, "linux", itemArch)
_ = settingRepo.Update("SystemStatus", "Upgrading") _ = settingRepo.Update("SystemStatus", "Upgrading")
go func() { go func() {
oldLang := common.LoadParams("LANGUAGE")
if err := files.DownloadFileWithProxy(downloadPath+"/"+fileName, downloadDir+"/"+fileName); err != nil { if err := files.DownloadFileWithProxy(downloadPath+"/"+fileName, downloadDir+"/"+fileName); err != nil {
global.LOG.Errorf("download service file failed, err: %v", err) global.LOG.Errorf("download service file failed, err: %v", err)
_ = settingRepo.Update("SystemStatus", "Free") _ = settingRepo.Update("SystemStatus", "Free")
@ -165,6 +169,11 @@ func (u *UpgradeService) Upgrade(req dto.Upgrade) error {
u.handleRollback(originalDir, 2) u.handleRollback(originalDir, 2)
return return
} }
if _, err := cmd.RunDefaultWithStdoutBashCf("sed -i -e 's#LANGUAGE=.*#LANGUAGE=%s#g' /usr/local/bin/1pctl", oldLang); err != nil {
global.LOG.Errorf("upgrade basedir in 1pctl failed, err: %v", err)
u.handleRollback(originalDir, 2)
return
}
if err := files.CopyItem(false, true, path.Join(tmpDir, "1panel-core.service"), "/etc/systemd/system"); err != nil { if err := files.CopyItem(false, true, path.Join(tmpDir, "1panel-core.service"), "/etc/systemd/system"); err != nil {
global.LOG.Errorf("upgrade 1panel.service failed, err: %v", err) global.LOG.Errorf("upgrade 1panel.service failed, err: %v", err)