chore: optimize directory structure

pkgforge · Dec 2, 2024 · 6a32e14 · 6a32e14
1 parent 7e7b42b
commit 6a32e14
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 18 deletions.
diff --git a/cmd/sbuild-linter/main.go b/cmd/sbuild-linter/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/pkgforge/sbuilder-go/logger"
-	"github.com/pkgforge/sbuilder-go/validator"
+	"github.com/pkgforge/sbuilder-go/pkg/linter"
 )
 
 const errorMessage = `incorrect SBUILD File. Please recheck @ https://www.yamllint.com
@@ -40,7 +40,7 @@ func main() {
 		// Print which file is being verified
 		fmt.Printf("\x1b[44m\x1b[30m\x1b[4m[+]\x1b[0m Verifying %s\n", file)
 
-		validator, err := validator.NewValidator(file)
+		validator, err := linter.NewValidator(file)
 		if err != nil {
 			logger.Log.Error(err.Error())
 			logger.Log.Error(errorMessage)

diff --git a/validator/checkCategoriesValidity.go → pkg/linter/checkCategoriesValidity.go b/validator/checkCategoriesValidity.go → pkg/linter/checkCategoriesValidity.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"bufio"

diff --git a/validator/checkDisabledField.go → pkg/linter/checkDisabledField.go b/validator/checkDisabledField.go → pkg/linter/checkDisabledField.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/checkDuplicateFields.go → pkg/linter/checkDuplicateFields.go b/validator/checkDuplicateFields.go → pkg/linter/checkDuplicateFields.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/checkEmptyFields.go → pkg/linter/checkEmptyFields.go b/validator/checkEmptyFields.go → pkg/linter/checkEmptyFields.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/checkEnforcedFields.go → pkg/linter/checkEnforcedFields.go b/validator/checkEnforcedFields.go → pkg/linter/checkEnforcedFields.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/checkPkgId.go → pkg/linter/checkPkgId.go b/validator/checkPkgId.go → pkg/linter/checkPkgId.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/checkRequiredFields.go → pkg/linter/checkRequiredFields.go b/validator/checkRequiredFields.go → pkg/linter/checkRequiredFields.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/checkRunScript.go → pkg/linter/checkRunScript.go b/validator/checkRunScript.go → pkg/linter/checkRunScript.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 func (v *Validator) validateRunScript(noShellcheck bool) ([]byte, error, string) {
 	if xExec, ok := v.data["x_exec"].(map[string]interface{}); ok {

diff --git a/validator/checkShebang.go → pkg/linter/checkShebang.go b/validator/checkShebang.go → pkg/linter/checkShebang.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"bufio"

diff --git a/validator/checkSingleValueFields.go → pkg/linter/checkSingleValueFields.go b/validator/checkSingleValueFields.go → pkg/linter/checkSingleValueFields.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/checkURLsValidity.go → pkg/linter/checkURLsValidity.go b/validator/checkURLsValidity.go → pkg/linter/checkURLsValidity.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/checkVersion.go → pkg/linter/checkVersion.go b/validator/checkVersion.go → pkg/linter/checkVersion.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/checkYamlValidity.go → pkg/linter/checkYamlValidity.go b/validator/checkYamlValidity.go → pkg/linter/checkYamlValidity.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 // The library does this check, so... Don't have to do anything here.
 func (v *Validator) validateYAML() ([]byte, error, string) {

diff --git a/validator/embedded/validCategories.list → pkg/linter/embedded/validCategories.list b/validator/embedded/validCategories.list → pkg/linter/embedded/validCategories.list
diff --git a/validator/util.go → pkg/linter/util.go b/validator/util.go → pkg/linter/util.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/validation_level.go → pkg/linter/validation_level.go b/validator/validation_level.go → pkg/linter/validation_level.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"

diff --git a/validator/validator.go → pkg/linter/validator.go b/validator/validator.go → pkg/linter/validator.go
@@ -1,4 +1,4 @@
-package validator
+package linter
 
 import (
 	"fmt"