feat; remove machine file support

Author: arush15june

README.md

@@ -4,12 +4,9 @@
 
 … because sometimes you just need to reliably identify your machines.
 
-[![GoDoc](https://godoc.org/github.com/denisbrodbeck/machineid?status.svg)](https://godoc.org/github.com/denisbrodbeck/machineid) [![Go Report Card](https://goreportcard.com/badge/github.com/denisbrodbeck/machineid)](https://goreportcard.com/report/github.com/denisbrodbeck/machineid)
-
 ## Fork
 
-[This](https://github.com/panta/machineid) is a fork of [github.com/denisbrodbeck/machineid](https://github.com/denisbrodbeck/machineid).
-The fork solve some issues in the original library (docker support and customizable machine-id file, macOS cron support, ...).
+[This](https://github.com/fourcorelabs/machineid) is a fork of [github.com/panta/machineid](https://github.com/panta/machineid).
 
 ## Main Features
 
@@ -23,13 +20,13 @@ The fork solve some issues in the original library (docker support and customiza
 Get the library with
 
 ```bash
-go get github.com/panta/machineid
+go get github.com/fourcorelabs/machineid
 ```
 
 You can also add the cli app directly to your `$GOPATH/bin` with
 
 ```bash
-go get github.com/panta/machineid/cmd/machineid
+go get github.com/fourcorelabs/machineid/cmd/machineid
 ```
 
 ## Usage
@@ -40,7 +37,7 @@ package main
 import (
   "fmt"
   "log"
-  "github.com/panta/machineid"
+  "github.com/fourcorelabs/machineid"
 )
 
 func main() {
@@ -60,7 +57,7 @@ package main
 import (
   "fmt"
   "log"
-  "github.com/panta/machineid"
+  "github.com/fourcorelabs/machineid"
 )
 
 func main() {
@@ -118,7 +115,7 @@ import (
   "crypto/hmac"
   "crypto/sha256"
   "fmt"
-  "github.com/panta/machineid"
+  "github.com/fourcorelabs/machineid"
 )
 
 const appKey = "WowSuchNiceApp"

cmd/machineid/main.go

@@ -3,19 +3,21 @@
 // Usage: machineid [options]
 //
 // Options:
-//   --appid    <AppID>    Protect machine id by hashing it together with an app id.
+//
+//	--appid    <AppID>    Protect machine id by hashing it together with an app id.
 //
 // Try:
-//   machineid
-//   machineid --appid MyAppID
+//
+//	machineid
+//	machineid --appid MyAppID
 package main
 
 import (
 	"flag"
 	"fmt"
 	"log"
 
-	"github.com/panta/machineid"
+	"github.com/fourcorelabs/machineid"
 )
 
 const usageStr = `

example_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/panta/machineid"
+	"github.com/fourcorelabs/machineid"
 )
 
 func Example() {

go.mod

@@ -1,3 +1,5 @@
-module github.com/panta/machineid
+module github.com/fourcorelabs/machineid
 
 go 1.15
+
+require golang.org/x/sys v0.30.0 // indirect

go.sum

@@ -0,0 +1,2 @@
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

helper.go

@@ -5,7 +5,6 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"strings"
@@ -28,11 +27,11 @@ func protect(appID, id string) string {
 }
 
 func readFile(filename string) ([]byte, error) {
-	return ioutil.ReadFile(filename)
+	return os.ReadFile(filename)
 }
 
 func writeFile(filename string, data []byte) error {
-	return ioutil.WriteFile(filename, data, 0644)
+	return os.WriteFile(filename, data, 0644)
 }
 
 // readFirstFile tries all the pathnames listed and returns the contents of the first readable file.

id.go

@@ -1,8 +1,8 @@
 // Package machineid provides support for reading the unique machine id of most OSs (without admin privileges).
 //
-// https://github.com/panta/machineid
+// https://github.com/fourcorelabs/machineid
 //
-// https://godoc.org/github.com/panta/machineid/cmd/machineid
+// https://godoc.org/github.com/fourcorelabs/machineid/cmd/machineid
 //
 // This package is Cross-Platform (tested on Win7+, Debian 8+, Ubuntu 14.04+, OS X 10.6+, FreeBSD 11+)
 // and does not use any internal hardware IDs (no MAC, BIOS, or CPU).
@@ -17,7 +17,7 @@
 // Linux users can generate a new id with `dbus-uuidgen` and put the id into
 // `/var/lib/dbus/machine-id` and `/etc/machine-id`.
 // Windows users can use the `sysprep` toolchain to create images, which produce valid images ready for distribution.
-package machineid // import "github.com/panta/machineid"
+package machineid // import "github.com/fourcorelabs/machineid"
 
 import (
 	"fmt"

id_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package machineid
@@ -36,19 +37,17 @@ const (
 // The logic implemented is a variation of the one described in https://github.com/denisbrodbeck/machineid/issues/5#issuecomment-523803164
 // See also https://unix.stackexchange.com/questions/144812/generate-consistent-machine-unique-id
 func machineID() (string, error) {
-	env_pathname := os.Getenv(ENV_VARNAME)
-
 	home := os.Getenv("HOME")
 	userMachineId := path.Join(home, ".config", "machine-id")
 
 	id, err := readFirstFile([]string{
-		env_pathname, dbusPath, dbusPathEtc, userMachineId,
+		dbusPath, dbusPathEtc, userMachineId,
 	})
 	if err != nil {
 		id, err = readFile(linuxRandomUuid)
 		if err == nil {
 			writeFirstFile([]string{
-				env_pathname, dbusPathEtc, dbusPath, userMachineId,
+				dbusPathEtc, dbusPath, userMachineId,
 			}, id)
 		}
 	}

id_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package machineid