CasaOS - A simple, easy-to-use, elegant open-source Personal Cloud system.
Merge branch 'v0.3.7' of https://github.com/IceWhaleTech/CasaOS into v0.3.7
LinkLeong4bb81e466902
diff --cc service/system.goindex 845927b,b7feef8..497a469--- a/service/system.go+++ b/service/system.go@@@ -220,16 -214,12 +214,17 @@@ func (s *systemService) UpdateSystemVeros.Remove(config.AppInfo.LogPath + "/upgrade.log")}file.CreateFile(config.AppInfo.LogPath + "/upgrade.log")- // go command2.OnlyExec("curl -fsSL https://raw.githubusercontent.com/LinkLeong/casaos-alpha/main/update.sh | bash")- go command2.OnlyExec("curl -fsSL https://raw.githubusercontent.com/IceWhaleTech/get/main/update.sh | bash")- // s.log.Error(config.AppInfo.ProjectPath + "/shell/tool.sh -r " + version)- // s.log.Error(command2.ExecResultStr(config.AppInfo.ProjectPath + "/shell/tool.sh -r " + version))+ //go command2.OnlyExec("curl -fsSL https://raw.githubusercontent.com/LinkLeong/casaos-alpha/main/update.sh | bash")+ if len(config.ServerInfo.UpdateUrl) > 0 {+ go command2.OnlyExec("curl -fsSL " + config.ServerInfo.UpdateUrl + " | bash")+ } else {+ go command2.OnlyExec("curl -fsSL https://raw.githubusercontent.com/IceWhaleTech/get/main/update.sh | bash")+ }++ //s.log.Error(config.AppInfo.ProjectPath + "/shell/tool.sh -r " + version)+ //s.log.Error(command2.ExecResultStr(config.AppInfo.ProjectPath + "/shell/tool.sh -r " + version))}+func (s *systemService) UpdateAssist() {command2.ExecResultStrArray("source " + config.AppInfo.ShellPath + "/assist.sh")}