fixes

steve02081504 · Mar 19, 2024 · c176e1d · c176e1d
1 parent 6103511
commit c176e1d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/docs/README_CN.md b/docs/README_CN.md
@@ -211,7 +211,7 @@ $NextScript | ps12exe -outputFile $PSScriptRoot/$NextNumber.exe *> $null
 $Number
 ```
 
-`#_require` 统计整个脚本中需要的模块，并在正式脚本前加入等价以下代码的脚本：
+`#_require` 统计整个脚本中需要的模块，并在第一次`#_require`前加入等价以下代码的脚本：
 
 ```powershell
 $modules | ForEach-Object{

diff --git a/docs/README_EN.md b/docs/README_EN.md
@@ -212,7 +212,7 @@ $NextScript | ps12exe -outputFile $PSScriptRoot/$NextNumber.exe *> $null
 $Number
 ```
 
-`#_require` count the modules needed in the entire script and add the script equivalent of the following code before the official script:
+`#_require` count the modules needed in the entire script and add the script equivalent of the following code before the first `#_require`:
 
 ```powershell
 $modules | ForEach-Object{

diff --git a/src/GUI/Main.ps1 b/src/GUI/Main.ps1
@@ -1,5 +1,6 @@
 #Requires -Version 5.0
 
+#_if PSScript
 <#
 .SYNOPSIS
 ps12exeGUI is a GUI tool for ps12exe.
@@ -21,13 +22,16 @@ ps12exeGUI -ConfigFile 'ps12exe.json' -Localize 'en-UK' -UIMode 'Dark'
 ps12exeGUI -help
 #>
 [CmdletBinding()]
+#_endif
 param(
 	[ValidatePattern('|.(psccfg|xml)$')]
 	[string]$ConfigFile,
+	#_if PSScript
 	[ArgumentCompleter({
 		Param($commandName, $parameterName, $wordToComplete, $commandAst, $fakeBoundParameters)
 		. "$PSScriptRoot\..\LocaleArgCompleter.ps1" @PSBoundParameters
 	})]
+	#_endif
 	[string]$Localize,
 	[ValidateSet('Light', 'Dark', 'Auto')]
 	[string]$UIMode = 'Auto',
@@ -36,6 +40,7 @@ param(
 	[switch]$help
 )
 
+#_if PSScript
 if ($help) {
 	$LocalizeData = . $PSScriptRoot\..\LocaleLoader.ps1 -Localize $Localize
 	$MyHelp = $LocalizeData.GUIHelpData
@@ -76,3 +81,14 @@ finally {
 	# Restore Console Window Title
 	$Host.UI.RawUI.WindowTitle = $BackUpTitle
 }
+#_else
+#_require ps12exe
+#_pragma Console 0
+#_pragma iconFile $PSScriptRoot/../../../img/icon.ico
+#_pragma title ps12exeGUI
+#_pragma description 'A super cool GUI for compile powershell scripts'
+#_!!if (!(Test-Path -LiteralPath "Registry::HKEY_CURRENT_USER\Software\Classes\ps12exeGUI.psccfg")){
+#_!!	Set-ps12exeContextMenu 1
+#_!!}
+#_!!ps12exeGUI @PSBoundParameters
+#_endif
diff --git a/src/ReadScriptFile.ps1 b/src/ReadScriptFile.ps1
@@ -20,6 +20,7 @@
 function Preprocessor($Content, $FilePath) {
 	$Result = @()
 	$requiredModules = @()
+	$requireFlag = $False
 	# 处理#_if <PSEXE/PSScript>、#_else、#_endif
 	for ($index = 0; $index -lt $Content.Count; $index++) {
 		$Line = $Content[$index]
@@ -33,14 +34,12 @@ function Preprocessor($Content, $FilePath) {
 			while ($index -lt $Content.Count) {
 				$index++
 				$Line = $Content[$index]
-				if ($Line -match "^\s*#_else\s*(?!#.*)") {
-					$condition = -not $condition
-				}
 				if ($Line -match "^\s*#_endif\s*(?!#.*)") {
 					break
 				}
-				if ($condition) {
-					$Result += $Line
+				if ($condition) { $Result += $Line }
+				if ($Line -match "^\s*#_else\s*(?!#.*)") {
+					$condition = -not $condition
 				}
 			}
 			if ($Line -notmatch "^\s*#_endif\s*(?!#.*)") {
@@ -145,6 +144,10 @@ function Preprocessor($Content, $FilePath) {
 	ForEach-Object {
 		if ($_ -match "^(\s*)#_require\s+(?<moduleList>[^#]+)\s*(?!#.*)") {
 			$requiredModules += $Matches["moduleList"].Split(', |;、　') | Where-Object { $_.Trim('"''') -ne '' }
+			if (!$requireFlag) {
+				$requireFlag = $true
+				[bigint]::Parse('72')
+			}
 		}
 		else { $_ }
 	} |
@@ -206,5 +209,13 @@ function Preprocessor($Content, $FilePath) {
 	elseif ($requiredModules.Count -eq 1) {
 		"if(!(gmo $requiredModules -ListAvailable -ea SilentlyContinue)){Install-Module $requiredModules -Scope CurrentUser -Force -ea Stop}"
 	}
-	(,$LoadModuleScript + $Content) -join "`n"
+	if ($LoadModuleScript) {
+		$Content = $Content | ForEach-Object {
+			# 在第一次#_require的前方加入$LoadModuleScript
+			if ($_ -is [bigint]) {
+				$LoadModuleScript
+			} else { $_ }
+		}
+	}
+	$Content -join "`n"
 }