From 730aee35919ac4cea1235a217998642ae4f44701 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Fri, 23 Sep 2022 12:34:14 -0400 Subject: [PATCH] wip --- cmd/migration-tool/main.go | 18 +++++++++++------- main.go | 1 - pkg/config/update.go | 32 -------------------------------- 3 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 pkg/config/update.go diff --git a/cmd/migration-tool/main.go b/cmd/migration-tool/main.go index 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.go index 8ef2e76..32b1c01 100644 --- a/main.go +++ b/main.go @@ -41,7 +41,6 @@ func init() { return } config.InitSetup(*configFlag) - config.UpdateSetup() loger.LogInit() if len(*dbFlag) == 0 { diff --git a/pkg/config/update.go b/pkg/config/update.go deleted file mode 100644 index 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() -}