(Go version) Multi platform build (#319)
This commit is contained in:
11
pkg/bbutil/umask_posix.go
Normal file
11
pkg/bbutil/umask_posix.go
Normal file
@@ -0,0 +1,11 @@
|
||||
// +build !windows
|
||||
|
||||
package bbutil
|
||||
|
||||
import "syscall"
|
||||
|
||||
// Umask is a no-op on Windows, and calls syscall.Umask on all other
|
||||
// systems. On Windows it returns 0, which is a decoy.
|
||||
func Umask(mask int) int {
|
||||
return syscall.Umask(mask)
|
||||
}
|
||||
9
pkg/bbutil/umask_windows.go
Normal file
9
pkg/bbutil/umask_windows.go
Normal file
@@ -0,0 +1,9 @@
|
||||
// +build windows
|
||||
|
||||
package bbutil
|
||||
|
||||
// Umask is a no-op on Windows, and calls syscall.Umask on all other
|
||||
// systems. On Windows it returns 0, which is a decoy.
|
||||
func Umask(mask int) int {
|
||||
return 0o000
|
||||
}
|
||||
@@ -7,7 +7,6 @@ import (
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"syscall"
|
||||
|
||||
"github.com/StackExchange/blackbox/v2/pkg/bblog"
|
||||
"github.com/StackExchange/blackbox/v2/pkg/bbutil"
|
||||
@@ -66,9 +65,9 @@ func (crypt CrypterHandle) Decrypt(filename string, umask int, overwrite bool) e
|
||||
}
|
||||
a = append(a, filename+".gpg")
|
||||
|
||||
oldumask := syscall.Umask(umask)
|
||||
oldumask := bbutil.Umask(umask)
|
||||
err := bbutil.RunBash(crypt.GPGCmd, a...)
|
||||
syscall.Umask(oldumask)
|
||||
bbutil.Umask(oldumask)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -118,10 +117,10 @@ func (crypt CrypterHandle) Encrypt(filename string, umask int, receivers []strin
|
||||
a = append(a, filename)
|
||||
//err = bbutil.RunBash("ls", "-la")
|
||||
|
||||
oldumask := syscall.Umask(umask)
|
||||
oldumask := bbutil.Umask(umask)
|
||||
crypt.logDebug.Printf("Args = %q", a)
|
||||
err = bbutil.RunBash(crypt.GPGCmd, a...)
|
||||
syscall.Umask(oldumask)
|
||||
bbutil.Umask(oldumask)
|
||||
|
||||
return encrypted, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user