CasaOS - A simple, easy-to-use, elegant open-source Personal Cloud system.
remove /DATA directory initialization - moved to local-storage (#578)
Tiger Wang455d226dcdb3
diff --git a/cmd/migration-tool/main.go b/cmd/migration-tool/main.goindex 5f7c60b..93b065d 100644--- a/cmd/migration-tool/main.go+++ b/cmd/migration-tool/main.go@@ -28,25 +28,29 @@ const (casaosServiceName = "casaos.service")-var _logger *Logger-var sqliteDB *gorm.DB+var (+ _logger *Logger+ sqliteDB *gorm.DB+)-var configFlag = ""-var dbFlag = ""+var (+ configFlag = ""+ dbFlag = ""+)func init() {config.InitSetup(configFlag)- config.UpdateSetup()if len(dbFlag) == 0 {dbFlag = config.AppInfo.DBPath + "/db"}sqliteDB = sqlite.GetDb(dbFlag)- //gredis.GetRedisConn(config.RedisInfo),+ // gredis.GetRedisConn(config.RedisInfo),service.MyService = service.NewService(sqliteDB, "")}+func main() {versionFlag := flag.Bool("v", false, "version")debugFlag := flag.Bool("d", true, "debug")@@ -113,6 +117,6 @@ func main() {selectedMigrationTool.PostMigrate()_logger.Info("casaos migration ok")- //panic(err)+ // panic(err)}diff --git a/main.go b/main.goindex f02afca..32b1c01 100644--- a/main.go+++ b/main.go@@ -28,9 +28,11 @@ const LOCALHOST = "127.0.0.1"var sqliteDB *gorm.DB-var configFlag = flag.String("c", "", "config address")-var dbFlag = flag.String("db", "", "db path")-var versionFlag = flag.Bool("v", false, "version")+var (+ configFlag = flag.String("c", "", "config address")+ dbFlag = flag.String("db", "", "db path")+ versionFlag = flag.Bool("v", false, "version")+)func init() {flag.Parse()@@ -39,7 +41,6 @@ func init() {return}config.InitSetup(*configFlag)- config.UpdateSetup()loger.LogInit()if len(*dbFlag) == 0 {@@ -47,7 +48,7 @@ func init() {}sqliteDB = sqlite.GetDb(*dbFlag)- //gredis.GetRedisConn(config.RedisInfo),+ // gredis.GetRedisConn(config.RedisInfo),service.MyService = service.NewService(sqliteDB, config.CommonInfo.RuntimePath)@@ -60,7 +61,6 @@ func init() {// go service.LoopFriend()// go service.MyService.App().CheckNewImage()-}// @title casaOS API@@ -80,21 +80,21 @@ func main() {return}go route.SocketInit(service.NotifyMsg)- //model.Setup()- //gredis.Setup()+ // model.Setup()+ // gredis.Setup()r := route.InitRouter()- //service.SyncTask(sqliteDB)+ // service.SyncTask(sqliteDB)cron2 := cron.New()- //every day execution+ // every day executionerr := cron2.AddFunc("0/5 * * * * *", func() {if service.ClientCount > 0 {- //route.SendNetINfoBySocket()- //route.SendCPUBySocket()- //route.SendMemBySocket()+ // route.SendNetINfoBySocket()+ // route.SendCPUBySocket()+ // route.SendMemBySocket()// route.SendDiskBySocket()- //route.SendUSBBySocket()+ // route.SendUSBBySocket()route.SendAllHardwareStatusBySocket()}})@@ -123,7 +123,7 @@ func main() {}go func() {time.Sleep(time.Second * 2)- //v0.3.6+ // v0.3.6if config.ServerInfo.HttpPort != "" {changePort := common.ChangePortRequest{}changePort.Port = config.ServerInfo.HttpPortdiff --git a/pkg/config/update.go b/pkg/config/update.godeleted file mode 100644index 7dbae82..0000000--- a/pkg/config/update.go+++ /dev/null@@ -1,32 +0,0 @@-package config--import (- "runtime"-- "github.com/IceWhaleTech/CasaOS/pkg/utils/file"-)--//检查目录是否存在-func mkdirDATAAll() {- sysType := runtime.GOOS- var dirArray []string- if sysType == "linux" {- dirArray = []string{"/DATA/AppData", "/DATA/Documents", "/DATA/Downloads", "/DATA/Gallery", "/DATA/Media/Movies", "/DATA/Media/TV Shows", "/DATA/Media/Music"}- }-- if sysType == "windows" {- dirArray = []string{"C:\\CasaOS\\DATA\\AppData", "C:\\CasaOS\\DATA\\Documents", "C:\\CasaOS\\DATA\\Downloads", "C:\\CasaOS\\DATA\\Gallery", "C:\\CasaOS\\DATA\\Media/Movies", "C:\\CasaOS\\DATA\\Media\\TV Shows", "C:\\CasaOS\\DATA\\Media\\Music"}- }- if sysType == "darwin" {- dirArray = []string{"./CasaOS/DATA/AppData", "./CasaOS/DATA/Documents", "./CasaOS/DATA/Downloads", "./CasaOS/DATA/Gallery", "./CasaOS/DATA/Media/Movies", "./CasaOS/DATA/Media/TV Shows", "./CasaOS/DATA/Media/Music"}- }-- for _, v := range dirArray {- file.IsNotExistMkDir(v)- }--}--func UpdateSetup() {- mkdirDATAAll()-}