diff --git a/Projects/PhoenixPE/100-ConfigSource.script b/Projects/PhoenixPE/100-ConfigSource.script index ee50afa..7b4ce56 100644 --- a/Projects/PhoenixPE/100-ConfigSource.script +++ b/Projects/PhoenixPE/100-ConfigSource.script @@ -35,8 +35,8 @@ Author=Homes32 Level=1 Selected=True Mandatory=True -Version=1.1.3.0 -Date=2023-06-21 +Version=1.1.4.0 +Date=2024-06-26 [Variables] @@ -51,12 +51,12 @@ End // Set Output Directories If,%fb_OutputDir%,Equal,"",WriteInterface,Value,%ScriptFile%,Interface,fb_OutputDir,"#$pBaseDir#$p\Output\#$pProjectTitle#$p\" -StrFormat,CTrim,%fb_OutputDir%,\,%tmp_OutputDir% +StrFormat,EndTrim,%fb_OutputDir%,\,%tmp_OutputDir% Set,%OutputDir%,%tmp_OutputDir%,PERMANENT Set,%tmp_OutputDir%,Nil If,%fb_IsoOutputDir%,Equal,"",WriteInterface,Value,%ScriptFile%,Interface,fb_IsoOutputDir,"#$pBaseDir#$p\Output\" -StrFormat,CTrim,%fb_IsoOutputDir%,\,%tmp_ISODir% +StrFormat,EndTrim,%fb_IsoOutputDir%,\,%tmp_ISODir% Set,%ISODir%,%tmp_ISODir%,PERMANENT Set,%tmp_ISODir%,Nil @@ -122,7 +122,7 @@ Echo,"Verifying Source..." Run,%ScriptFile%,ResetVars // SourceDir -StrFormat,CTrim,%fb_SrcPath%,"\",%fb_SrcPath% +StrFormat,EndTrim,%fb_SrcPath%,"\",%fb_SrcPath% Set,%SourceDir%,%fb_SrcPath%,PERMANENT /////////////////////////////////////////////////////////////////////////////////// @@ -505,7 +505,7 @@ lbl_ImageInfo="Image Info:",1,1,64,274,60,16,8,Normal lbl_ImgInfo=,1,1,131,274,474,16,8,Bold bvl_DestCfg_Basic="Configure Destination",1,12,5,313,625,65,8,Bold bvl_DestCfg_Advanced="Configure Destination",0,12,5,313,625,140,8,Bold -cb_RunFromWim="Run all programs from RAM (Boot.wim)",1,3,15,342,215,18,False,"__Select this option to pack all programs into Boot.wim regardless of individual script settings.#$x#$xRequired for PXE/Network boot." +cb_RunFromWim="Run all programs from RAM (Boot.wim)",1,3,15,342,215,18,False,"__Select this option to pack all programs into Boot.wim regardless of individual script settings.#$x#$xRequired for PXE/Network boot, wimboot, etc." txt_YProgramsDirName="Programs folder:",0,0,394,342,200,21,Programs,"__The name of the 'Programs' folder on the final media Y: drive (CD/DVD/USB).#$x#$xChanging the name of the Programs folder can be useful if you run more then one WinPE#$xfrom a single USB drive and need to keep your programs separated.#$x#$xChanges will take effect on the next build." lbl_OutputDir="Output Dir:",0,1,17,389,70,16,8,Bold fb_OutputDir=%BaseDir%\Output\%ProjectTitle%\,0,13,94,383,525,20,dir,"Title=Select the directory where the final build will be saved","__The directory where the final build will be saved. (eg. BOOT.WIM, Programs, etc.)" diff --git a/Projects/PhoenixPE/Applications/Backup & Imaging/UltraISO.script b/Projects/PhoenixPE/Applications/Backup & Imaging/UltraISO.script index 1710d45..07ba336 100644 --- a/Projects/PhoenixPE/Applications/Backup & Imaging/UltraISO.script +++ b/Projects/PhoenixPE/Applications/Backup & Imaging/UltraISO.script @@ -35,8 +35,8 @@ Author=Homes32 Level=5 Selected=False Mandatory=False -Version=1.0.1.0 -Date=2022-06-27 +Version=1.0.2.0 +Date=2024-06-26 Interface=Interface [Variables] @@ -85,7 +85,7 @@ RegWrite,HKLM,0x1,"Tmp_Software\Classes\UltraISO\shell\open\command","","#$q%PEP StrFormat,REPLACE,%txt_RegisterFileExt%,#$s,"",%txt_RegisterFileExt% ForEach,%Ext%,%txt_RegisterFileExt%,Delim=#$c,Begin - StrFormat,CTRIM,%Ext%,".",%FileExt% + StrFormat,StartTrim,%Ext%,".",%FileExt% RegWrite,HKLM,0x1,"Tmp_Software\Classes\.%FileExt%","","UltraISO" End diff --git a/Projects/PhoenixPE/Applications/Networking/Chrome.script b/Projects/PhoenixPE/Applications/Networking/Chrome.script index 04625dc..2f911a1 100644 --- a/Projects/PhoenixPE/Applications/Networking/Chrome.script +++ b/Projects/PhoenixPE/Applications/Networking/Chrome.script @@ -35,8 +35,8 @@ Author=Homes32 Level=5 Selected=False Mandatory=False -Version=1.1.10.0 -Date=2024-06-20 +Version=1.1.11.0 +Date=2024-06-26 [Variables] %ProgramFolder%="Chrome" @@ -102,7 +102,7 @@ Echo,"Configuring %ScriptTitle%..." // Setup the master_preferences file for settings where policy is blocked unless you are joined to a domain FileDeleteEx,"%TargetPrograms%\%ProgramFolder%\master_preferences" FileCreateBlank,"%TargetPrograms%\%ProgramFolder%\master_preferences" -StrFormat,CTrim,"%PEPrograms%\%ProgramFolder%","\",%ProgramDirEsc% +StrFormat,EndTrim,"%PEPrograms%\%ProgramFolder%","\",%ProgramDirEsc% StrFormat,Replace,"%PEPrograms%\%ProgramFolder%","\","\\",%ProgramDirEsc% TxtAddLine,"%TargetPrograms%\%ProgramFolder%\master_preferences","{#$qdistribution#$q:{#$qimport_bookmarks_from_file#$q:#$q%ProgramDirEsc%\\bookmarks.html#$q,#$qsuppress_first_run_bubble#$q:true,#$qdo_not_create_desktop_shortcut#$q:true,#$qdo_not_create_quick_launch_shortcut#$q:true,#$qdo_not_launch_chrome#$q:true,#$qdo_not_register_for_update_launch#$q:true,#$qmake_chrome_default#$q:true,#$qmake_chrome_default_for_user#$q:true,#$qsuppress_first_run_default_browser_prompt#$q:true,#$qsystem_level#$q:true},#$qhomepage#$q:#$q${txt_Homepage}#$q,#$qhomepage_is_newtabpage#$q:true,#$qfirst_run_tabs#$q:[#$q${txt_Homepage}#$q]}",APPEND @@ -126,8 +126,8 @@ RegWrite,HKLM,0x1,"Tmp_Software\Microsoft\Active Setup\Installed Components\{8A6 // User Config - Script Interface // Language (Policy) -StrFormat,SPLIT,%cmb_Language%,"[",2,%Lang% -StrFormat,RTRIM,%Lang%,1,%Lang% +StrFormat,Split,%cmb_Language%,"[",2,%Lang% +StrFormat,RTrim,%Lang%,1,%Lang% RegWrite,HKLM,0x1,"Tmp_Software\Policies\Google\Chrome\Recommended","ApplicationLocaleValue","%Lang%" // Show Home Button (Policy) @@ -152,7 +152,7 @@ Else,TxtReplace,"%TargetPrograms%\%ProgramFolder%\master_preferences","${txt_Hom // Import Bookmarks If,ExistFile,%fb_ImportBookmarks%,Begin - StrFormat,EXT,%fb_ImportBookmarks%,%FileExt% + StrFormat,Ext,%fb_ImportBookmarks%,%FileExt% If,Not,%FileExt%,Equal,".html",Halt,"ERROR: Bookmarks to import must be in .HTML format." Else,Begin Echo,"Importing user provided bookmarks..." diff --git a/Projects/PhoenixPE/Applications/System Tools/Runscanner2.script b/Projects/PhoenixPE/Applications/System Tools/Runscanner2.script index 5beb192..95d781b 100644 --- a/Projects/PhoenixPE/Applications/System Tools/Runscanner2.script +++ b/Projects/PhoenixPE/Applications/System Tools/Runscanner2.script @@ -47,11 +47,11 @@ Echo,"Processing %ScriptTitle%..." If,%cb_RunFromRam%,Equal,True,RunFromRam -StrFormat,SPLIT,%cmb_Language%,"[",2,%Lang% -StrFormat,RTRIM,%Lang%,1,%Lang% -StrFormat,CTRIM,%txt_ShellContextMenuTxt%," ",%txt_ShellContextMenuTxt% -StrFormat,CTRIM,%txt_RegCmdParams%," ",%txt_RegCmdParams% -StrFormat,CTRIM,%txt_ShellExtParams%," ",%txt_ShellExtParams% +StrFormat,Split,%cmb_Language%,"[",2,%Lang% +StrFormat,RTrim,%Lang%,1,%Lang% +StrFormat,CTrim,%txt_ShellContextMenuTxt%,"",%txt_ShellContextMenuTxt% +StrFormat,CTrim,%txt_RegCmdParams%,"",%txt_RegCmdParams% +StrFormat,CTrim,%txt_ShellExtParams%,"",%txt_ShellExtParams% /////////////////////////////////////////////////////////////////////////////////// // Extract diff --git a/Projects/PhoenixPE/Core/200-PreFlight.script b/Projects/PhoenixPE/Core/200-PreFlight.script index 9c43e9e..574e999 100644 --- a/Projects/PhoenixPE/Core/200-PreFlight.script +++ b/Projects/PhoenixPE/Core/200-PreFlight.script @@ -35,12 +35,12 @@ Author=Homes32 Level=2 Selected=True Mandatory=True -Version=1.1.3.0 -Date=2023-06-21 +Version=1.1.5.0 +Date=2024-06-29 [Variables] // Minimum PEBakery version that has the command/feature set that is compatible with PhoenixPE. -%MinEngineVersion%=1.0.1 +%MinEngineVersion%=1.2.0 [Process] Echo,"Starting Pre-Flight Check..." @@ -283,7 +283,7 @@ End // Remove the SPBuild for this comparison StrFormat,NTrim,%SourceVer%,%tmp_SourceVer% -StrFormat,CTrim,%tmp_SourceVer%,".",%tmp_SourceVer% +StrFormat,EndTrim,%tmp_SourceVer%,".",%tmp_SourceVer% List,Pos,%aSupportedVersions%,%tmp_SourceVer%,%VerPos% If,%VerPos%,Equal,0,Begin diff --git a/Projects/PhoenixPE/Drivers/DriverIntegration.script b/Projects/PhoenixPE/Drivers/DriverIntegration.script index 8d4dde8..8953423 100644 --- a/Projects/PhoenixPE/Drivers/DriverIntegration.script +++ b/Projects/PhoenixPE/Drivers/DriverIntegration.script @@ -35,8 +35,8 @@ Author=Homes32 Level=6 Selected=False Mandatory=False -Version=1.1.3.0 -Date=2024-03-09 +Version=1.1.4.0 +Date=2024-06-26 [Variables] %DismLog%=%TargetWindows%\Logs\DISM\dism.log @@ -78,14 +78,14 @@ Else,Exit,"No drivers are available for integration.#$x#$x[%DriversSrc%]#$x#$xdo // =============================================================================================================================== [IntegrateDrivers] Echo,"Integrating Drivers...#$x#$xThis can take awhile, please be patient." -StrFormat,PATH,%DismLog%,%DismLogPath% +StrFormat,Path,%DismLog%,%DismLogPath% If,Not,ExistDir,%DismLogPath%,DirMake,%DismLogPath% If,%cb_ForceUnsignedDrivers%,Equal,True,Set,%DismForceUnsigned%," /ForceUnsigned" Else,Set,%DismForceUnsigned%,"" // DISM doesn't like trailing \ in path -StrFormat,CTrim,%DriversSrc%,"\",%DriversSrc% +StrFormat,EndTrim,%DriversSrc%,"\",%DriversSrc% DISM,"/image:#$q%TargetDir%#$q /Add-Driver /Driver:#$q%DriversSrc%#$q /recurse /LogPath:#$q%DismLog%#$q%DismForceUnsigned%" If,Not,#r,Equal,0,Halt,"Error: Dism.exe terminated with error code: [#r]. Check the log for details." diff --git a/Projects/PhoenixPE/PhoenixAPI.script b/Projects/PhoenixPE/PhoenixAPI.script index 2185591..bc3cb35 100644 --- a/Projects/PhoenixPE/PhoenixAPI.script +++ b/Projects/PhoenixPE/PhoenixAPI.script @@ -32,8 +32,8 @@ Title=PhoenixPE API Author=Homes32 Description=PhoenixPE scripting support library. -Version=1.9.3.0 -Date=2024-02-07 +Version=1.9.4.0 +Date=2024-06-28 Level=0 Selected=None @@ -414,7 +414,7 @@ Math,BitOr,%Bits%,0x%Bits%,%BitMask% // Back to Hex for our return value Math,Hex,%Hex%,%Bits%,%BitSize% -StrFormat,LTRIM,%Hex%,2,%Hex% +StrFormat,LTrim,%Hex%,2,%Hex% List,Set,%BitArray%,%BitGroup%,%Hex%,Delim=#$c Return,%BitArray% @@ -450,10 +450,10 @@ If,ExistRegSubKey,HKLM,"Tmp_Software",Set,%RegHivesLoaded%,True Else,Set,%RegHivesLoaded%,False // Remove . from the file extension if present. -StrFormat,CTRIM,%FileExt%,".",%FileExt% +StrFormat,StartTrim,%FileExt%,".",%FileExt% -StrFormat,FILENAME,%Program%,%ProgramFileName% -StrFormat,EXT,%ProgramFileName%,%ProgramExt% +StrFormat,Filename,%Program%,%ProgramFileName% +StrFormat,Ext,%ProgramFileName%,%ProgramExt% List,Pos,%ExeExtList%,%ProgramExt%,%IsExecutable% If,%IsExecutable%,Equal,0,Halt,"Associate Error: [%Program%] is not an executable file (%ExeExtList%)." Else,Begin @@ -532,7 +532,7 @@ Math,BitAnd,%Bits%,0x%Bits%,%BitMask% // Back to Hex for our return value Math,Hex,%Hex%,%Bits%,%BitSize% -StrFormat,LTRIM,%Hex%,2,%Hex% +StrFormat,LTrim,%Hex%,2,%Hex% List,Set,%BitArray%,%BitGroup%,%Hex%,Delim=#$c Return,%BitArray% @@ -577,7 +577,7 @@ Math,BitOr,%Bits%,0x%Bits%,%BitMask% // Back to Hex for our return value Math,Hex,%Hex%,%Bits%,%BitSize% -StrFormat,LTRIM,%Hex%,2,%Hex% +StrFormat,LTrim,%Hex%,2,%Hex% List,Set,%BitArray%,%BitGroup%,%Hex%,Delim=#$c Return,%BitArray% @@ -622,7 +622,7 @@ Math,BitXOr,%Bits%,0x%Bits%,%BitMask% // Back to Hex for our return value Math,Hex,%Hex%,%Bits%,%BitSize% -StrFormat,LTRIM,%Hex%,2,%Hex% +StrFormat,LTrim,%Hex%,2,%Hex% List,Set,%BitArray%,%BitGroup%,%Hex%,Delim=#$c Return,%BitArray% @@ -652,7 +652,7 @@ GetParam,1,%SourceImage% Getparam,2,%TargetImage% Getparam,3,%ResizeTo% -StrFormat,EXT,%TargetImage%,%NewImageExt% +StrFormat,Ext,%TargetImage%,%NewImageExt% Echo,"Converting [%SourceImage%] to a [%NewImageExt%] image..." If,Not,%ResizeTo%,Equal,"",Set,%ResizeParam%," --resize:%ResizeTo%" ShellExecute,Hide,"%Tools%\%HostArch%\ImageConvert.exe","#$q%SourceImage%#$q #$q%TargetImage%#$q --silent%ResizeParam%" @@ -763,7 +763,7 @@ ForEach,%WildCard%,"*|?",Begin If,Not,%WildCardPos%,Equal,0,Halt,"FileCopyEx Syntax Error: Wildcards are not supported." End -StrFormat,CTrim,%DestPath%,"\",%DestPath% +StrFormat,EndTrim,%DestPath%,"\",%DestPath% If,Not,ExistDir,%DestPath%,DirMake,%DestPath% FileCopy,%SrcFile%,%DestPath% @@ -1293,7 +1293,7 @@ If,#2,Equal,"",Halt,"MSIExtract Syntax Error: You must specify the destination d GetParam,1,%SetupFile% GetParam,2,%DestDir% -StrFormat,CTrim,%DestDir%,"\","%DestDir%" +StrFormat,EndTrim,%DestDir%,"\","%DestDir%" ShellExecute,Hide,"%Tools%\anycpu\lessmsi\lessmsi.exe","x #$q%SetupFile%#$q #$q%DestDir%\#$q" If,Not,%ExitCode%,Equal,0,Begin @@ -1549,7 +1549,7 @@ GetParam,2,%Arg2% If,%Arg2%,Equal,NOREG,Set,%NOREG%,True Else,Set,%NOREG%,False -StrFormat,RTRIM,%InfFile%,3,%InfFileNoExt% +StrFormat,RTrim,%InfFile%,3,%InfFileNoExt% Set,%RequireDriver-Listfile%,%ProjectTemp%\RequireDriver-ListFile.txt FileDeleteEx,%RequireDriver-Listfile% @@ -1772,7 +1772,7 @@ If,#2,Equal,"",Halt,"WixExtract Syntax Error: You must specify the destination d GetParam,1,%SetupFile% Getparam,2,%DestDir% -StrFormat,CTrim,%DestDir%,"\","%DestDir%" +StrFormat,EndTrim,%DestDir%,"\","%DestDir%" ShellExecute,Hide,"%Tools%\anycpu\wix\dark.exe","-x #$q%DestDir%#$q #$q%SetupFile%#$q" If,Not,%ExitCode%,Equal,0,Begin diff --git a/Projects/PhoenixPE/Testing/VMWare.script b/Projects/PhoenixPE/Testing/VMWare.script index 4a60675..30bbc71 100644 --- a/Projects/PhoenixPE/Testing/VMWare.script +++ b/Projects/PhoenixPE/Testing/VMWare.script @@ -32,12 +32,12 @@ Title=VMware Author=Homes32 Description=Run your ISO in VMware Player/Workstation -Version=1.1.2.0 +Version=1.1.3.0 Level=9 Selected=False Mandatory=False NoWarning=False -Date=2022-08-16 +Date=2024-06-28 [Variables] %VMPath%=%ProjectTemp%\VMware @@ -218,7 +218,7 @@ If,%cb_EnableTPM%,Equal,True,TxtAddLine,%VMCfg%,"managedvm.autoAddVTPM = #$qsoft If,Not,%cmb_SharedFolder%,Equal,Disabled,Begin If,Not,ExistDir,%fb_SharedFolder%,DirMake,%fb_SharedFolder% - StrFormat,CTrim,%fb_SharedFolder%,\,%fb_SharedFolder% + StrFormat,EndTrim,%fb_SharedFolder%,\,%fb_SharedFolder% StrFormat,Split,%fb_SharedFolder%,\,0,%tmp_pathFolderCount% StrFormat,Split,%fb_SharedFolder%,\,%tmp_pathFolderCount%,%SharedFolderName% diff --git a/Projects/PhoenixPE/Testing/VirtualBox.script b/Projects/PhoenixPE/Testing/VirtualBox.script index 41185cc..14d8a9b 100644 --- a/Projects/PhoenixPE/Testing/VirtualBox.script +++ b/Projects/PhoenixPE/Testing/VirtualBox.script @@ -32,12 +32,12 @@ Title=VirtualBox Author=Homes32 Description=Run your ISO in Oracle VirtualBox -Version=1.0.2.0 +Version=1.0.3.0 Level=9 Selected=False Mandatory=False NoWarning=False -Date=2022-08-16 +Date=2024-06-26 [Variables] %vmName%=%ProjectTitle% @@ -198,7 +198,7 @@ Set,%tmp_Delay%,Nil // Shared Folder If,Not,%cmb_SharedFolder%,Equal,Disabled,Begin If,Not,ExistDir,%fb_SharedFolder%,DirMake,%fb_SharedFolder% - StrFormat,CTrim,%fb_SharedFolder%,\,%fb_SharedFolder% + StrFormat,EndTrim,%fb_SharedFolder%,\,%fb_SharedFolder% StrFormat,Split,%fb_SharedFolder%,\,0,%tmp_pathFolderCount% StrFormat,Split,%fb_SharedFolder%,\,%tmp_pathFolderCount%,%SharedFolderName% diff --git a/Projects/PhoenixPE/Tweaks/Localization.script b/Projects/PhoenixPE/Tweaks/Localization.script index 4465cad..59a5d6c 100644 --- a/Projects/PhoenixPE/Tweaks/Localization.script +++ b/Projects/PhoenixPE/Tweaks/Localization.script @@ -50,38 +50,38 @@ Date=2023-10-17 Echo,"Preparing to configure International settings..." // Format Keyboard -StrFormat,POS,%cmb_InputLocale1%,),%Pos% +StrFormat,Pos,%cmb_InputLocale1%,),%Pos% If,%Pos%,Bigger,0,Begin - StrFormat,LTRIM,%cmb_InputLocale1%,1,%InputLocale1% + StrFormat,LTrim,%cmb_InputLocale1%,1,%InputLocale1% Math,Sub,%Pos%,%Pos%,2 - StrFormat,LEFT,%InputLocale1%,%Pos%,%InputLocale1% + StrFormat,Left,%InputLocale1%,%Pos%,%InputLocale1% End Else,Set,%InputLocale1%,%cmb_InputLocale1% -StrFormat,POS,%cmb_InputLocale2%,),%Pos% +StrFormat,Pos,%cmb_InputLocale2%,),%Pos% If,%Pos%,Bigger,0,Begin - StrFormat,LTRIM,%cmb_InputLocale2%,1,%InputLocale2% + StrFormat,LTrim,%cmb_InputLocale2%,1,%InputLocale2% Math,Sub,%Pos%,%Pos%,2 - StrFormat,LEFT,%InputLocale2%,%Pos%,%InputLocale2% + StrFormat,Left,%InputLocale2%,%Pos%,%InputLocale2% End Else,Set,%InputLocale2%,%cmb_InputLocale2% // Format Date/Time -StrFormat,POS,%cmb_UserLocale%,),%Pos% +StrFormat,Pos,%cmb_UserLocale%,),%Pos% If,%Pos%,Bigger,0,Begin - StrFormat,LTRIM,%cmb_UserLocale%,1,%UserLocale% + StrFormat,LTrim,%cmb_UserLocale%,1,%UserLocale% Math,Sub,%Pos%,%Pos%,2 - StrFormat,LEFT,%UserLocale%,%Pos%,%UserLocale% + StrFormat,Left,%UserLocale%,%Pos%,%UserLocale% End Else,Set,%UserLocale%,%cmb_UserLocale% // Format TimeZone -StrFormat,POS,%cmb_TimeZone%,),%Pos% -StrFormat,LTRIM,%cmb_TimeZone%,%Pos%,%TimeZone% -StrFormat,CTRIM,%TimeZone%," ",%TimeZone% +StrFormat,Pos,%cmb_TimeZone%,),%Pos% +StrFormat,LTrim,%cmb_TimeZone%,%Pos%,%TimeZone% +StrFormat,CTrim,%TimeZone%,"",%TimeZone% // Prepare DISM -StrFormat,PATH,%DismLog%,%DismLogPath% +StrFormat,Path,%DismLog%,%DismLogPath% If,Not,ExistDir,%DismLogPath%,DirMake,%DismLogPath% // Get HostOS Settings if needed diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 86f7b76..9756eb0 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,6 +2,19 @@ Notable changes to the PhoenixPE project. +## Release UNRELEASED + +### Added +- Added the option to configure the default Execution Policy on the Windows Powershell and Powershell Core scripts. + +### Changed +- PhoenixPE now requires PEBakery v1.2.0-develop or greater due to new StrFormat,StartTrim` and `StrFormat,EndTrim` commands implemented. +- Changed usage of `StrFormat,Ctrim` to use `StrFormat,StartTrim` and `StrFormat,EndTrim` where appropriate. (Issue #96) + +### Fixed + +### Removed + ## Release 2024-06-20 ### Added