HeliC829/go2spec
1
0
Fork 0
forked from misaka00251/go2spec
Code Pull Requests Activity

Only exit with error if folder is non-empty

Browse Source
This commit is contained in:
Julian Zhu
2026-04-14 16:10:00 +08:00
parent c4cf02616a
commit c3045d0cfe
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
pack.go
View File

@@ -417,8 +417,14 @@ func createDirectory(openRuyiSrc string) (string, error) {
return "", fmt.Errorf("get cwd: %w", err)
}
dir := filepath.Join(wd, openRuyiSrc)
if err := os.Mkdir(dir, 0755); err != nil {
return "", fmt.Errorf("mkdir: %w", err)
// Try to create the directory
err = os.Mkdir(dir, 0755)
if err != nil {
// If directory already exists, that's ok (it was verified to be empty)
if !os.IsExist(err) {
return "", fmt.Errorf("mkdir: %w", err)
}
}
return dir, nil
}
@@ -663,9 +669,6 @@ func mainPack(args []string, usage func()) {
if pkgType != typeGuess {
openRuyiSrc = nameFromGopkg(gopkg, pkgType, customProgPkgName, allowUnknownHoster)
if _, err := os.Stat(openRuyiSrc); err == nil {
log.Fatalf("Output directory %q already exists, aborting\n", openRuyiSrc)
}
}
if strings.ToLower(gopkg) != gopkg {
@@ -679,23 +682,7 @@ func mainPack(args []string, usage func()) {
gopkg, strings.ToLower(gopkg))
}
info, err := os.Stat(openRuyiSrc)
if err == nil {
if !info.IsDir() {
log.Fatalf("%q exists but is not a directory\n", openRuyiSrc)
}
entries, err := os.ReadDir(openRuyiSrc)
if err != nil {
log.Fatalf("Failed to read directory %q: %v\n", openRuyiSrc, err)
}
if len(entries) != 0 {
log.Fatalf("Output directory %q exists and is non-empty, aborting\n", openRuyiSrc)
}
} else if !os.IsNotExist(err) {
log.Fatalf("Failed to stat %q: %v\n", openRuyiSrc, err)
}
// NOTE: directory existence is checked after determining final openRuyiSrc
// Create a tarball of the upstream source
u, err := makeUpstreamSourceTarball(gopkg, gitRevision, forcePrerelease)
@@ -713,6 +700,23 @@ func mainPack(args []string, usage func()) {
}
}
// Now that we know the final package name, check output directory
info, err := os.Stat(openRuyiSrc)
if err == nil {
if !info.IsDir() {
log.Fatalf("%q exists but is not a directory\n", openRuyiSrc)
}
entries, err := os.ReadDir(openRuyiSrc)
if err != nil {
log.Fatalf("Failed to read directory %q: %v\n", openRuyiSrc, err)
}
if len(entries) != 0 {
log.Fatalf("Output directory %q exists and is non-empty, aborting\n", openRuyiSrc)
}
} else if !os.IsNotExist(err) {
log.Fatalf("Failed to stat %q: %v\n", openRuyiSrc, err)
}
orig := fmt.Sprintf("%s_%s.orig.tar.%s", openRuyiSrc, u.version, u.compression)
log.Printf("Moving tempfile to %q\n", orig)
// We need to copy the file, merely renaming is not enough since the file