use os.TmpDir() to get temporary files dir

skycoin · Jan 31, 2024 · 1b89650 · 1b89650
1 parent d990dae
commit 1b89650
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 42 deletions.
diff --git a/cmd/skywire-cli/commands/proxy/proxy.go b/cmd/skywire-cli/commands/proxy/proxy.go
@@ -250,8 +250,8 @@ func init() {
 	listCmd.Flags().StringVarP(&sdURL, "sdurl", "a", skyenv.ServiceDiscAddr, "service discovery url")
 	listCmd.Flags().BoolVarP(&rawData, "raw", "r", false, "print raw data")
 	listCmd.Flags().BoolVarP(&noFilterOnline, "noton", "o", false, "do not filter by online status in UT")
-	listCmd.Flags().StringVar(&cacheFileSD, "cfs", "/tmp/proxysd.json", "SD cache file location")
-	listCmd.Flags().StringVar(&cacheFileUT, "cfu", "/tmp/ut.json", "UT cache file location.")
+	listCmd.Flags().StringVar(&cacheFileSD, "cfs", os.TempDir()+"/proxysd.json", "SD cache file location")
+	listCmd.Flags().StringVar(&cacheFileUT, "cfu", os.TempDir()+"/ut.json", "UT cache file location.")
 	listCmd.Flags().IntVarP(&cacheFilesAge, "cfa", "m", 5, "update cache files if older than n minutes")
 	listCmd.Flags().StringVarP(&pk, "pk", "k", "", "check "+serviceType+" service discovery for public key")
 	listCmd.Flags().BoolVarP(&isUnFiltered, "unfilter", "u", false, "provide unfiltered results")

diff --git a/cmd/skywire-cli/commands/proxy/root.go b/cmd/skywire-cli/commands/proxy/root.go
@@ -10,26 +10,26 @@ import (
 )
 
 var (
-	version        = buildinfo.Version()
-	binaryName     = "skysocks-client"
-	stateName      = "skysocks-client"
-	serviceType    = servicedisc.ServiceTypeProxy
-	isUnFiltered   bool
-	rawData        bool
-	utURL          string
-	sdURL          string
-	cacheFileSD    string
-	cacheFileUT    string
-	cacheFilesAge  int
-	ver            string
-	country        string
-	isStats        bool
-	pubkey         cipher.PubKey
-	pk             string
-	allClients     bool
-	noFilterOnline bool
-	clientName     string
-	addr           string
+	version         = buildinfo.Version()
+	binaryName      = "skysocks-client"
+	stateName       = "skysocks-client"
+	serviceType     = servicedisc.ServiceTypeProxy
+	isUnFiltered    bool
+	rawData         bool
+	utURL           string
+	sdURL           string
+	cacheFileSD     string
+	cacheFileUT     string
+	cacheFilesAge   int
+	ver             string
+	country         string
+	isStats         bool
+	pubkey          cipher.PubKey
+	pk              string
+	allClients      bool
+	noFilterOnline  bool
+	clientName      string
+	addr            string
 	startingTimeout int
 )
 

diff --git a/cmd/skywire-cli/commands/vpn/root.go b/cmd/skywire-cli/commands/vpn/root.go
@@ -10,24 +10,24 @@ import (
 )
 
 var (
-	version        = buildinfo.Version()
-	stateName      = "vpn-client"
-	serviceType    = servicedisc.ServiceTypeVPN
-	isUnFiltered   bool
-	rawData        bool
-	utURL          string
-	sdURL          string
-	cacheFileSD    string
-	cacheFileUT    string
-	cacheFilesAge  int
-	noFilterOnline bool
-	path           string
-	isPkg          bool
-	ver            string
-	country        string
-	isStats        bool
-	pubkey         cipher.PubKey
-	pk             string
+	version         = buildinfo.Version()
+	stateName       = "vpn-client"
+	serviceType     = servicedisc.ServiceTypeVPN
+	isUnFiltered    bool
+	rawData         bool
+	utURL           string
+	sdURL           string
+	cacheFileSD     string
+	cacheFileUT     string
+	cacheFilesAge   int
+	noFilterOnline  bool
+	path            string
+	isPkg           bool
+	ver             string
+	country         string
+	isStats         bool
+	pubkey          cipher.PubKey
+	pk              string
 	startingTimeout int
 )
 

diff --git a/cmd/skywire-cli/commands/vpn/vvpn.go b/cmd/skywire-cli/commands/vpn/vvpn.go
@@ -173,8 +173,8 @@ func init() {
 	listCmd.Flags().StringVarP(&sdURL, "sdurl", "a", skyenv.ServiceDiscAddr, "service discovery url")
 	listCmd.Flags().BoolVarP(&rawData, "raw", "r", false, "print raw data")
 	listCmd.Flags().BoolVarP(&noFilterOnline, "noton", "o", false, "do not filter by online status in UT")
-	listCmd.Flags().StringVar(&cacheFileSD, "cfs", "/tmp/vpnsd.json", "SD cache file location")
-	listCmd.Flags().StringVar(&cacheFileUT, "cfu", "/tmp/ut.json", "UT cache file location.")
+	listCmd.Flags().StringVar(&cacheFileSD, "cfs", os.TempDir()+"/vpnsd.json", "SD cache file location")
+	listCmd.Flags().StringVar(&cacheFileUT, "cfu", os.TempDir()+"/ut.json", "UT cache file location.")
 	listCmd.Flags().IntVarP(&cacheFilesAge, "cfa", "m", 5, "update cache files if older than n minutes")
 	listCmd.Flags().StringVarP(&pk, "pk", "k", "", "check "+serviceType+" service discovery for public key")
 	listCmd.Flags().BoolVarP(&isUnFiltered, "unfilter", "u", false, "provide unfiltered results")