diff --git a/api/api.bat b/api/api.bat index 0e56790..4684c8e 100644 --- a/api/api.bat +++ b/api/api.bat @@ -1,11 +1,13 @@ chcp 936 > nul setlocal enabledelayedexpansion -if not exist "%SystemDrive%\Windows\Setup\xrsysdebug.txt" ( - @echo off - mode con: cols=70 lines=5 - color 1f -) +@echo off +@REM mode con: cols=70 lines=5 +color 1f cd /d "%~dp0" +if exist "%SystemDrive%\Windows\SysWOW64\wscript.exe" ( + set "PROCESSOR_ARCHITECTURE=AMD64" + move /y "%~dp0apifiles\PECMD64.EXE" "%~dp0apifiles\PECMD.EXE" +) set aria="%~dp0aria2c.exe" --check-certificate=false --save-not-found=false --always-resume=false --auto-save-interval=10 --auto-file-renaming=false --allow-overwrite=true -c set dmi="%~dp0apifiles\DMI.exe" set netuser="%~dp0apifiles\NetUser.exe" @@ -17,9 +19,6 @@ set pecmd="%~dp0apifiles\PECMD.EXE" set srtool="%~dp0apifiles\srtool.exe" set wlan="%~dp0apifiles\WLAN.exe" set zip="%~dp0apifiles\7z.exe" -if exist "%SystemDrive%\Windows\SysWOW64\wscript.exe" ( - set "PROCESSOR_ARCHITECTURE=AMD64" -) ::系统版本判断 set osver=0&& set osname=Win ::上面一行可根据系统情况手动填写系统版本,并将下面全部注释掉 diff --git a/build.bat b/build.bat index 3631bec..1d28811 100644 --- a/build.bat +++ b/build.bat @@ -28,6 +28,8 @@ rem https://github.com/M2TeamArchived/NSudo/releases v8.2 curl.exe -sSL https://file.uhsea.com/2403/10fdf98fa1b888327c172e04bb92d762KW.exe -o osc\apifiles\NSudoLC.exe || exit rem PECMD2012.1.88.05.94Stable-230422 x86 noimd safe curl.exe -sSL https://file.uhsea.com/2404/09632f9544a70ee83fed715a5c8e93b3HU.exe -o osc\apifiles\PECMD.exe || exit +rem PECMD2012.1.88.05.94Stable-230422 x64 noimd safe +curl.exe -sSL https://file.uhsea.com/2404/5415281d7adc574a7ab5bb9be1ff8730HU.exe -o osc\apifiles\PECMD64.exe || exit rem SystemRestore tool by hp curl.exe -sSL https://file.uhsea.com/2403/ca1e5c28b2637b556dff75d0043a2504FF.exe -o osc\apifiles\srtool.exe || exit rem Wbox - Ver. 1.11 - Message box for batch - (c) 2011-2013, Horst Schaeffer diff --git a/osc/osc.bat b/osc/osc.bat index f5bf8bf..1d2cc4f 100644 --- a/osc/osc.bat +++ b/osc/osc.bat @@ -3,6 +3,10 @@ setlocal EnableDelayedExpansion @echo off title 潇然系统优化组件 XRSYS-OSC cd /d "%~dp0" +if exist "%systemdrive%\Windows\SysWOW64\wscript.exe" ( + set "PROCESSOR_ARCHITECTURE=AMD64" + move /y "%~dp0apifiles\PECMD64.EXE" "%~dp0apifiles\PECMD.EXE" +) set aria="%~dp0aria2c.exe" --check-certificate=false --save-not-found=false --always-resume=false --auto-save-interval=10 --auto-file-renaming=false --allow-overwrite=true -c set dmi="%~dp0apifiles\DMI.exe" set netuser="%~dp0apifiles\NetUser.exe" @@ -14,9 +18,7 @@ set pecmd="%~dp0apifiles\PECMD.EXE" set srtool="%~dp0apifiles\srtool.exe" set wlan="%~dp0apifiles\WLAN.exe" set zip="%~dp0apifiles\7z.exe" -if exist "%systemdrive%\Windows\SysWOW64\wscript.exe" ( - set "PROCESSOR_ARCHITECTURE=AMD64" -) + echo 系统版本判断 set osver=0&& set osname=Win ver | find /i "5.1." > nul && set osver=1&& set osname=WinXP