Merge pull request #6 from akunzai/cleanup

Code cleanup
akunzai · Jan 4, 2023 · 321b6aa · 321b6aa
2 parents 9cb209f + 329bc21
commit 321b6aa
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@
 Sample output
 
 ````markdown
-# Windows Secure Auditor: 0.0.4
+# Windows Secure Auditor: 0.0.5
 
 ## System Information
 

diff --git a/README.zh-TW.md b/README.zh-TW.md
@@ -30,7 +30,7 @@
 範例輸出
 
 ````markdown
-# Windows Secure Auditor: 0.0.4
+# Windows Secure Auditor: 0.0.5
 
 ## 系統資訊
 

diff --git a/SecureAuditor.ps1 b/SecureAuditor.ps1
@@ -9,8 +9,6 @@ Import-Module ([IO.Path]::Combine($PSScriptRoot, 'SecureAuditor.psm1')) -Force
 $i18n = Data {
 	# culture="en-US"
 	ConvertFrom-StringData @'
-	Match = match
-	NotMatch = not match
 	SystemInfo = System Information
 	Error = Error
 '@

diff --git a/SecureAuditor.psd1 b/SecureAuditor.psd1
@@ -6,7 +6,7 @@
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion          = '0.0.4'
+    ModuleVersion          = '0.0.5'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -63,7 +63,7 @@
     # NestedModules = @()
 
     # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
-    FunctionsToExport      = @('Get-IniContent', 'IsLocalAdministrator', 'Write-CheckList', 'Write-RequireAdministrators')
+    FunctionsToExport      = @('Get-IniContent', 'IsLocalAdministrator', 'Write-CheckList', 'Write-RequireAdministrator')
 
     # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
     CmdletsToExport        = @()

diff --git a/SecureAuditor.psm1 b/SecureAuditor.psm1
@@ -45,7 +45,7 @@ function IsLocalAdministrator() {
 	return $false;
 }
 
-function Write-RequireAdministrators($ruleName) {
+function Write-RequireAdministrator($ruleName) {
 	Write-Host "`n> $($i18n.SkipRule): $($ruleName) ($($i18n.RequireAdministrator)) ..."
 }
 

diff --git a/rules/EventLogs.psm1 b/rules/EventLogs.psm1
@@ -17,7 +17,7 @@ if ($PSUICulture -ne 'en-US') {
 function Test($config) {
     if (-not (IsLocalAdministrator)) {
         $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
-        Write-RequireAdministrators($ruleName)
+        Write-RequireAdministrator($ruleName)
         return
     }
     $logNames = $config.EventLogs.LogNames -split ',\s*'

diff --git a/rules/Login.psm1 b/rules/Login.psm1
@@ -17,7 +17,7 @@ if ($PSUICulture -ne 'en-US') {
 function Test($config) {
     if (-not (IsLocalAdministrator)) {
         $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
-        Write-RequireAdministrators($ruleName)
+        Write-RequireAdministrator($ruleName)
         return
     }
     $days = [int]::Parse($config.Login.Days) * -1

diff --git a/rules/PasswordPolicy.psm1 b/rules/PasswordPolicy.psm1
@@ -16,7 +16,7 @@ if ($PSUICulture -ne 'en-US') {
 function Test($config) {
     if (-not (IsLocalAdministrator)) {
         $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
-        Write-RequireAdministrators($ruleName)
+        Write-RequireAdministrator($ruleName)
         return
     }
     # https://learn.microsoft.com/windows-server/administration/windows-commands/secedit-export

diff --git a/zh-TW/SecureAuditor.psd1 b/zh-TW/SecureAuditor.psd1
@@ -1,8 +1,6 @@
 # culture="zh-TW"
 ConvertFrom-StringData -StringData @'
 RequireAdministrator = 需要管理者權限
-Match = 符合
-NotMatch = 不符合
 SkipRule = 略過規則
 SystemInfo = 系統資訊
 Error = 錯誤