Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

fix image creation with local debian packages #418

Merged
merged 2 commits into from
Aug 16, 2021

Conversation

lorsatti
Copy link
Contributor

@lorsatti lorsatti commented Aug 4, 2021

Related to #417.

@codecov
Copy link

codecov bot commented Aug 4, 2021

Codecov Report

Merging #418 (0952a85) into master (a57b7c1) will decrease coverage by 0.16%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #418      +/-   ##
=========================================
- Coverage    6.40%   6.24%   -0.17%     
=========================================
  Files           7       7              
  Lines         765     785      +20     
=========================================
  Hits           49      49              
- Misses        709     729      +20     
  Partials        7       7              
Flag Coverage Δ
go 6.24% <0.00%> (-0.17%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
build/chrome.go 0.00% <0.00%> (ø)
build/edge.go 0.00% <0.00%> (ø)
build/firefox.go 0.00% <0.00%> (ø)
build/opera.go 0.00% <0.00%> (ø)
build/yandex.go 0.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 870b0cb...0952a85. Read the comment docs.

@vania-pooh
Copy link
Member

@lorsatti sorry for the delay. Being on vacation and will check in detail during next days.

@lorsatti
Copy link
Contributor Author

lorsatti commented Aug 8, 2021

@vania-pooh Np. Enjoy your vacation!

Copy link
Member

@vania-pooh vania-pooh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry that is took so much time to review. Need to use filepath.Join everywhere instead of /. See my first comment. All the rest seems to be ok.

build/chrome.go Outdated
@@ -40,7 +40,11 @@ func (c *Chrome) Build() error {

if pkgSrcPath != "" {
srcDir = "chrome/local"
pkgDestPath := filepath.Join(devDestDir, "google-chrome.deb")
err := os.MkdirAll(devDestDir+"/"+srcDir, 0755)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should use filepath.Join to make file path separator platform-independent. Just declare pkgDestDir := filepath.Join(devDestDir, srcDir) and also use this value in pkgDestPath initialization.

build/edge.go Outdated
@@ -33,7 +33,11 @@ func (c *Edge) Build() error {

if pkgSrcPath != "" {
srcDir = "edge/local"
pkgDestPath := filepath.Join(devDestDir, "microsoft-edge.deb")
err := os.MkdirAll(devDestDir+"/"+srcDir, 0755)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use filepath.Join.

build/firefox.go Outdated
@@ -40,7 +40,11 @@ func (c *Firefox) Build() error {

if pkgSrcPath != "" {
devSrcDir = "firefox/local"
pkgDestPath := filepath.Join(devDestDir, "firefox.deb")
err := os.MkdirAll(devDestDir+"/"+devSrcDir, 0755)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use filepath.Join.

build/opera.go Outdated
@@ -31,7 +31,11 @@ func (o *Opera) Build() error {

if pkgSrcPath != "" {
srcDir = "opera/local"
pkgDestPath := filepath.Join(devDestDir, "opera.deb")
err := os.MkdirAll(devDestDir+"/"+srcDir, 0755)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use filepath.Join.

build/yandex.go Outdated
@@ -31,7 +31,11 @@ func (yb *YandexBrowser) Build() error {

if pkgSrcPath != "" {
srcDir = "yandex/local"
pkgDestPath := filepath.Join(devDestDir, "yandex-browser.deb")
err := os.MkdirAll(devDestDir+"/"+srcDir, 0755)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use filepath.Join.

@vania-pooh vania-pooh merged commit 5b1c2c0 into aerokube:master Aug 16, 2021
@vania-pooh
Copy link
Member

@lorsatti thank you for contribution!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants