Missing redo-cleanup's note

[goredo.git] / main.go

diff --git a/main.go b/main.go
index 3cc1a8f3ba6588fae23675ef93e8ccaaf0f02542..f8ad7dd423c30052820f392994296cdaaf1acabb 100644 (file)
--- a/main.go
+++ b/main.go
@@ -25,7 +25,6 @@ import (
        "flag"
        "fmt"
        "io"
-       "io/ioutil"
        "log"
        "os"
        "os/signal"
@@ -62,6 +61,7 @@ var (
        Cwd       string
        BuildUUID string
        IsTopRedo bool // is it the top redo instance
+       UmaskCur  int
 )
 
 func mustSetenv(key string) {
@@ -87,7 +87,6 @@ func CmdName() string {
 }
 
 func main() {
-       forcedIfchange := flag.Bool("f", false, "forced redo-ifchange")
        version := flag.Bool("version", false, "print version")
        warranty := flag.Bool("warranty", false, "print warranty information")
 
@@ -135,6 +134,9 @@ func main() {
        }
        log.SetFlags(log.Lshortfile)
 
+       UmaskCur = syscall.Umask(0)
+       syscall.Umask(UmaskCur)
+
        var err error
        Cwd, err = os.Getwd()
        if err != nil {
@@ -213,14 +215,14 @@ func main() {
        tracef(CDebug, "inode-trust: %s", InodeTrust)
 
        // Those are internal envs
-       FdOODTgts, err = ioutil.TempFile("", "ood-tgts")
+       FdOODTgts, err = os.CreateTemp("", "ood-tgts")
        if err != nil {
                log.Fatalln(err)
        }
        if err = os.Remove(FdOODTgts.Name()); err != nil {
                log.Fatalln(err)
        }
-       FdOODTgtsLock, err = ioutil.TempFile("", "ood-tgts.lock")
+       FdOODTgtsLock, err = os.CreateTemp("", "ood-tgts.lock")
        if err != nil {
                log.Fatalln(err)
        }
@@ -241,7 +243,7 @@ func main() {
                if _, err = fd.Seek(0, io.SeekStart); err != nil {
                        log.Fatalln(err)
                }
-               tgtsRaw, err := ioutil.ReadAll(bufio.NewReader(fd))
+               tgtsRaw, err := io.ReadAll(bufio.NewReader(fd))
                if err != nil {
                        log.Fatalln(err)
                }
@@ -336,7 +338,7 @@ CmdSwitch:
                        }
                }
        case CmdNameRedoIfchange:
-               ok, err = ifchange(tgts, *forcedIfchange, traced)
+               ok, err = ifchange(tgts, *flagForcedIfchange, traced)
                if err == nil {
                        err = depsWrite(fdDep, tgts)
                }
@@ -387,7 +389,7 @@ CmdSwitch:
                        log.Fatalln("single target expected")
                }
                var fdTmp *os.File
-               fdTmp, err = ioutil.TempFile("", "whichdo")
+               fdTmp, err = os.CreateTemp("", "whichdo")
                if err != nil {
                        break
                }