use filepath.Join for multi-platform compatibility

aerokube · Aug 16, 2021 · 0952a85 · 0952a85
1 parent 89cb23e
commit 0952a85
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/build/chrome.go b/build/chrome.go
@@ -40,11 +40,12 @@ func (c *Chrome) Build() error {
 
 	if pkgSrcPath != "" {
 		srcDir = "chrome/local"
-		err := os.MkdirAll(devDestDir+"/"+srcDir, 0755)
+		pkgDestDir := filepath.Join(devDestDir, srcDir)
+		err := os.MkdirAll(pkgDestDir, 0755)
 		if err != nil {
-			return fmt.Errorf("create %v temporary dir: %v", srcDir, err)
+			return fmt.Errorf("create %v temporary dir: %v", pkgDestDir, err)
 		}
-		pkgDestPath := filepath.Join(devDestDir, srcDir, "google-chrome.deb")
+		pkgDestPath := filepath.Join(pkgDestDir, "google-chrome.deb")
 		err = os.Rename(pkgSrcPath, pkgDestPath)
 		if err != nil {
 			return fmt.Errorf("move package: %v", err)

diff --git a/build/edge.go b/build/edge.go
@@ -33,11 +33,12 @@ func (c *Edge) Build() error {
 
 	if pkgSrcPath != "" {
 		srcDir = "edge/local"
-		err := os.MkdirAll(devDestDir+"/"+srcDir, 0755)
+		pkgDestDir := filepath.Join(devDestDir, srcDir)
+		err := os.MkdirAll(pkgDestDir, 0755)
 		if err != nil {
-			return fmt.Errorf("create %v temporary dir: %v", srcDir, err)
+			return fmt.Errorf("create %v temporary dir: %v", pkgDestDir, err)
 		}
-		pkgDestPath := filepath.Join(devDestDir, srcDir, "microsoft-edge.deb")
+		pkgDestPath := filepath.Join(pkgDestDir, "microsoft-edge.deb")
 		err = os.Rename(pkgSrcPath, pkgDestPath)
 		if err != nil {
 			return fmt.Errorf("move package: %v", err)

diff --git a/build/firefox.go b/build/firefox.go
@@ -40,11 +40,12 @@ func (c *Firefox) Build() error {
 
 	if pkgSrcPath != "" {
 		devSrcDir = "firefox/local"
-		err := os.MkdirAll(devDestDir+"/"+devSrcDir, 0755)
+		pkgDestDir := filepath.Join(devDestDir, devSrcDir)
+		err := os.MkdirAll(pkgDestDir, 0755)
 		if err != nil {
-			return fmt.Errorf("create %v temporary dir: %v", devSrcDir, err)
+			return fmt.Errorf("create %v temporary dir: %v", pkgDestDir, err)
 		}
-		pkgDestPath := filepath.Join(devDestDir, devSrcDir, "firefox.deb")
+		pkgDestPath := filepath.Join(pkgDestDir, "firefox.deb")
 		err = os.Rename(pkgSrcPath, pkgDestPath)
 		if err != nil {
 			return fmt.Errorf("move package: %v", err)

diff --git a/build/opera.go b/build/opera.go
@@ -31,11 +31,12 @@ func (o *Opera) Build() error {
 
 	if pkgSrcPath != "" {
 		srcDir = "opera/local"
-		err := os.MkdirAll(devDestDir+"/"+srcDir, 0755)
+		pkgDestDir := filepath.Join(devDestDir, srcDir)
+		err := os.MkdirAll(pkgDestDir, 0755)
 		if err != nil {
-			return fmt.Errorf("create %v temporary dir: %v", srcDir, err)
+			return fmt.Errorf("create %v temporary dir: %v", pkgDestDir, err)
 		}
-		pkgDestPath := filepath.Join(devDestDir, srcDir, "opera.deb")
+		pkgDestPath := filepath.Join(pkgDestDir, "opera.deb")
 		err = os.Rename(pkgSrcPath, pkgDestPath)
 		if err != nil {
 			return fmt.Errorf("move package: %v", err)

diff --git a/build/yandex.go b/build/yandex.go
@@ -31,11 +31,12 @@ func (yb *YandexBrowser) Build() error {
 
 	if pkgSrcPath != "" {
 		srcDir = "yandex/local"
-		err := os.MkdirAll(devDestDir+"/"+srcDir, 0755)
+		pkgDestDir := filepath.Join(devDestDir, srcDir)
+		err := os.MkdirAll(pkgDestDir, 0755)
 		if err != nil {
-			return fmt.Errorf("create %v temporary dir: %v", srcDir, err)
+			return fmt.Errorf("create %v temporary dir: %v", pkgDestDir, err)
 		}
-		pkgDestPath := filepath.Join(devDestDir, srcDir, "yandex-browser.deb")
+		pkgDestPath := filepath.Join(pkgDestDir, "yandex-browser.deb")
 		err = os.Rename(pkgSrcPath, pkgDestPath)
 		if err != nil {
 			return fmt.Errorf("move package: %v", err)