From 620f5e03abff0c7be008a8539c813f3158c645d4 Mon Sep 17 00:00:00 2001 From: Tovi Jaeschke-Rogers Date: Thu, 17 Feb 2022 12:48:13 +1030 Subject: [PATCH] Fix ignore paths --- .gitignore | 1 + Client/Filesystem/Config.go | 5 +++-- Variables/{Variables.go => Variables_unix.go} | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) mode change 100644 => 100755 .gitignore rename Variables/{Variables.go => Variables_unix.go} (91%) diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 4d8adb3..5206dab --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.tar.gz tjpkg test.go +lfs_packages diff --git a/Client/Filesystem/Config.go b/Client/Filesystem/Config.go index 105b6bc..d1b78b9 100644 --- a/Client/Filesystem/Config.go +++ b/Client/Filesystem/Config.go @@ -2,6 +2,7 @@ package Filesystem import ( "regexp" + "strings" "PackageManager/Variables" ) @@ -33,7 +34,7 @@ func InitPruneRegex() error { ) for _, s = range Variables.PruneRegexPaths { - r, err = regexp.Compile(s) + r, err = regexp.Compile(strings.Replace(s, "^/", "^"+Variables.RootDir, 1)) if err != nil { return err } @@ -50,7 +51,7 @@ func InitIgnoreRegex() error { ) for _, s = range Variables.IgnoreRegexPaths { - r, err = regexp.Compile(s) + r, err = regexp.Compile(strings.Replace(s, "^/", "^"+Variables.RootDir, 1)) if err != nil { return err } diff --git a/Variables/Variables.go b/Variables/Variables_unix.go similarity index 91% rename from Variables/Variables.go rename to Variables/Variables_unix.go index 8b7b950..798396f 100644 --- a/Variables/Variables.go +++ b/Variables/Variables_unix.go @@ -1,3 +1,6 @@ +//go:build linux || darwin || freebsd || !windows +// +build linux darwin freebsd !windows + package Variables import ( @@ -87,6 +90,10 @@ func init() { RootDir = rootDir } + if RootDir[len(RootDir)-1:] != "/" { + RootDir += "/" + } + editor = os.Getenv("EDITOR") if editor != "" { Editor = editor