@@ -48,23 +48,23 @@ func loadEnvVariables() {
4848 cwd = "."
4949 }
5050
51- projectRoot := cwd
51+ backendRoot := cwd
5252 for {
53- if _ , err := os .Stat (filepath .Join (projectRoot , "go.mod" )); err == nil {
53+ if _ , err := os .Stat (filepath .Join (backendRoot , "go.mod" )); err == nil {
5454 break
5555 }
5656
57- parent := filepath .Dir (projectRoot )
58- if parent == projectRoot {
57+ parent := filepath .Dir (backendRoot )
58+ if parent == backendRoot {
5959 break
6060 }
6161
62- projectRoot = parent
62+ backendRoot = parent
6363 }
6464
6565 envPaths := []string {
6666 filepath .Join (cwd , ".env" ),
67- filepath .Join (projectRoot , ".env" ),
67+ filepath .Join (backendRoot , ".env" ),
6868 }
6969
7070 var loaded bool
@@ -110,11 +110,13 @@ func loadEnvVariables() {
110110 }
111111 log .Info ("ENV_MODE loaded" , "mode" , env .EnvMode )
112112
113- env .PostgresesInstallDir = "./ tools/ postgresql"
113+ env .PostgresesInstallDir = filepath . Join ( backendRoot , " tools" , " postgresql")
114114 tools .VerifyPostgresesInstallation (env .EnvMode , env .PostgresesInstallDir )
115115
116- env .DataFolder = "../postgresus-data/data"
117- env .TempFolder = "../postgresus-data/temp"
116+ // Store the data and temp folders one level below the root
117+ // (projectRoot/postgresus-data -> /postgresus-data)
118+ env .DataFolder = filepath .Join (filepath .Dir (backendRoot ), "postgresus-data" , "data" )
119+ env .TempFolder = filepath .Join (filepath .Dir (backendRoot ), "postgresus-data" , "temp" )
118120
119121 log .Info ("Environment variables loaded successfully!" )
120122}
0 commit comments