Skip to content

Commit

Permalink
Merge pull request #101 from local-deploy/DL-T-69
Browse files Browse the repository at this point in the history
feat(env): different .env.example for frameworks
  • Loading branch information
varrcan committed Oct 18, 2023
2 parents 6436e54 + 40448b1 commit 0b4b225
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 35 deletions.
60 changes: 29 additions & 31 deletions command/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"path/filepath"

"github.com/local-deploy/dl/helper"
"github.com/local-deploy/dl/project"
"github.com/local-deploy/dl/utils"
"github.com/pterm/pterm"
"github.com/spf13/cobra"
)
Expand All @@ -26,10 +26,8 @@ func envCommand() *cobra.Command {
func runEnv() {
if project.IsEnvFileExists() {
showEnvMenu()
} else {
if copyEnv() {
pterm.FgGreen.Println("The .env file has been created successfully. Please specify the necessary variables.")
}
} else if copyEnv() {
pterm.FgGreen.Println("The .env file has been created successfully. Please specify the necessary variables.")
}
}

Expand All @@ -46,30 +44,15 @@ func showEnvMenu() {
deleteEnv()
copyEnv()
pterm.FgGreen.Println("File replaced successfully.")
break
case "just show":
printEnvConfig()
break
case "abort":
break
}
}

func printEnvConfig() {
templateDir := helper.TemplateDir()
src := filepath.Join(templateDir, ".env.example")

file, err := os.Open(src)
if err != nil {
pterm.FgRed.Println(err)
}
defer func() {
if err = file.Close(); err != nil {
pterm.FgRed.Println(err)
}
}()

scanner := bufio.NewScanner(file)
src, _ := utils.Templates.Open(filepath.Join("config-files", getEnvName()))
scanner := bufio.NewScanner(src)

pterm.Println()
pterm.FgGreen.Println("Copy the variables to your .env file and adjust the values")
Expand All @@ -88,24 +71,27 @@ func deleteEnv() {
}

func copyEnv() bool {
var src string
var (
src string
bytesRead []byte
err error
)

currentDir, _ := os.Getwd()
templateDir := helper.TemplateDir()

if project.IsEnvExampleFileExists() {
src = filepath.Join(currentDir, ".env.example")
bytesRead, err = os.ReadFile(src)
if err != nil {
pterm.FgRed.Println(err)
return false
}
} else {
src = filepath.Join(templateDir, ".env.example")
src = filepath.Join("config-files", getEnvName())
bytesRead, _ = utils.Templates.ReadFile(src)
}

dest := filepath.Join(currentDir, ".env")
bytesRead, err := os.ReadFile(src)
if err != nil {
pterm.FgRed.Println(err)
return false
}

err = os.WriteFile(dest, bytesRead, 0644) //nolint:gosec
if err != nil {
pterm.FgRed.Println(err)
Expand All @@ -114,3 +100,15 @@ func copyEnv() bool {
}
return true
}

func getEnvName() string {
currentDir, _ := os.Getwd()

bitrixPath := filepath.Join(currentDir, "bitrix")
_, err := os.Stat(bitrixPath)
if err != nil {
return ".env.example"
}

return ".env.example-bitrix"
}
4 changes: 0 additions & 4 deletions config-files/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,3 @@ DOCUMENT_ROOT=/var/www/html
PHP_VERSION=8.2-fpm
## Avalible versions: 5.7 8.0 ##
MYSQL_VERSION=8.0

## Deploy settings ##
EXCLUDED_TABLES=b_event_log,b_search_content_stem,b_search_content,b_search_content_text,b_search_content_title,b_search_phrase,b_search_suggest,b_perf_error
EXCLUDED_FILES=.git,upload,bitrix/backup,bitrix/cache,bitrix/managed_cache,bitrix/stack_cache,bitrix/tmp,.env
16 changes: 16 additions & 0 deletions config-files/.env.example-bitrix
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## Remote Server (PROD) ##
CATALOG_SRV=/var/www/html
USER_SRV=user
PORT_SRV=22
SERVER=127.0.0.1

## Local container config ##
DOCUMENT_ROOT=/var/www/html
## Avalible versions: 7.3-apache 7.4-apache 8.0-apache 8.1-apache 8.2-apache 7.3-fpm 7.4-fpm 8.0-fpm 8.1-fpm 8.2-fpm ##
PHP_VERSION=8.2-fpm
## Avalible versions: 5.7 8.0 ##
MYSQL_VERSION=8.0

## Deploy settings ##
EXCLUDED_TABLES=b_event_log,b_search_content_stem,b_search_content,b_search_content_text,b_search_content_title,b_search_phrase,b_search_suggest,b_perf_error
EXCLUDED_FILES=.git,upload,bitrix/backup,bitrix/cache,bitrix/managed_cache,bitrix/stack_cache,bitrix/tmp,.env

0 comments on commit 0b4b225

Please sign in to comment.