Merge pull request #455 from Unpackerr/dn2_more_homedir

davidnewhall · web-flow · commit 656654d96cab · 2024-07-13T00:04:18.000-07:00
allow homedir expansion with filepath: notation
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
 	golang.org/x/mod v0.19.0
 	golift.io/cnfg v0.2.3
-	golift.io/cnfgfile v0.0.0-20240710213444-9de6c05a8a5e
+	golift.io/cnfgfile v0.0.0-20240713024420-a5436d84eb48
 	golift.io/rotatorr v0.0.0-20230911015553-cd2abbd726c7
 	golift.io/starr v1.0.0
 	golift.io/version v0.0.2
diff --git a/go.sum b/go.sum
@@ -367,8 +367,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golift.io/cnfg v0.2.3 h1:cQsC4JS20njJyu5drtGefNmgN7M4HrLaRDNBPLit3pQ=
 golift.io/cnfg v0.2.3/go.mod h1:T4t8MFa8aZilCdIk1qQrN4mOGaFVPZ/qHQBBMbCIZJ0=
-golift.io/cnfgfile v0.0.0-20240710213444-9de6c05a8a5e h1:dv7KPAsQ+CuWT/GS/P8nGg68DnC9tbYMMWP9khwTCfY=
-golift.io/cnfgfile v0.0.0-20240710213444-9de6c05a8a5e/go.mod h1:zHm9o8SkZ6Mm5DfGahsrEJPsogyR0qItP59s5lJ98/I=
+golift.io/cnfgfile v0.0.0-20240713024420-a5436d84eb48 h1:c7cJWRr0cUnFHKtq072esKzhQHKlFA5YRY/hPzQrdko=
+golift.io/cnfgfile v0.0.0-20240713024420-a5436d84eb48/go.mod h1:zHm9o8SkZ6Mm5DfGahsrEJPsogyR0qItP59s5lJ98/I=
 golift.io/rotatorr v0.0.0-20230911015553-cd2abbd726c7 h1:8reg8mRdLxCz168FaGPf/kVxmDRDc92/Dhub54trdOc=
 golift.io/rotatorr v0.0.0-20230911015553-cd2abbd726c7/go.mod h1:59bC4ue06MetIY4iiHu3PCqVbzW0leGoCONZhH8dPZ8=
 golift.io/starr v1.0.0 h1:IDSaSL+ZYxdLT/Lg//dg/iwZ39LHO3D5CmbLCOgSXbI=
diff --git a/pkg/unpackerr/start.go b/pkg/unpackerr/start.go
@@ -158,7 +158,10 @@ func Start() (err error) {
 		os.Getuid(), os.Getgid(), getUmask(), version.Started.Round(time.Second))
 	u.Debugf(strings.Join(strings.Fields(strings.ReplaceAll(version.Print("unpackerr"), "\n", ", ")), " "))
 
-	output, err := cnfgfile.Parse(u.Config, &cnfgfile.Opts{Name: "Unpackerr"})
+	output, err := cnfgfile.Parse(u.Config, &cnfgfile.Opts{
+		Name:          "Unpackerr",
+		TransformPath: expandHomedir,
+	})
 	if err != nil {
 		return fmt.Errorf("using filepath: %w", err)
 	}
