Paravis_Flash
/
Windows_installer_NEW
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Редактирование под новую сборку

master
paravis 8 months ago
parent
f378b3e034
commit
5f8cf33ab2
1 changed files with 7 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      setup.au3

31
setup.au3
Unescape View File

@ -4,9 +4,7 @@
#include <WindowsConstants.au3> #include <WindowsConstants.au3>
#include <WinAPI.au3> #include <WinAPI.au3>
#NoTrayIcon #NoTrayIcon
Global $aArray = DriveGetDrive($DT_ALL), $sDisk, $iBtn11, $iBtn10, $iBtn7, $PathEr, $sDisk, $sDiskS, $UN11, $UN10x64, $UN10x86, $UN7x64, $UN7x86 Global $aArray = DriveGetDrive($DT_ALL), $sDisk, $iBtn11, $iBtn10, $iBtn7, $PathEr, $sDisk, $sDiskS, $UN11, $UN10x64, $UN10x86, $UN7x64, $UN7x86
For $i = 1 To $aArray[0] For $i = 1 To $aArray[0]
$aFileList = _FileListToArrayRec($aArray[$i] & "\WindowsESD", "NOT.DEL", $FLTAR_FILES, $FLTAR_RECUR, $FLTAR_NOSORT, $FLTAR_FULLPATH) $aFileList = _FileListToArrayRec($aArray[$i] & "\WindowsESD", "NOT.DEL", $FLTAR_FILES, $FLTAR_RECUR, $FLTAR_NOSORT, $FLTAR_FULLPATH)
If Not @error Then If Not @error Then
@ -15,7 +13,6 @@ For $i = 1 To $aArray[0]
ExitLoop ExitLoop
EndIf EndIf
Next Next
For $i = 1 To $aArray[0] For $i = 1 To $aArray[0]
$aFileList = _FileListToArrayRec($aArray[$i] & "\efi\Paravis\Windows", "NOT.DEL", $FLTAR_FILES, $FLTAR_RECUR, $FLTAR_NOSORT, $FLTAR_FULLPATH) $aFileList = _FileListToArrayRec($aArray[$i] & "\efi\Paravis\Windows", "NOT.DEL", $FLTAR_FILES, $FLTAR_RECUR, $FLTAR_NOSORT, $FLTAR_FULLPATH)
If Not @error Then If Not @error Then
@ -24,20 +21,17 @@ For $i = 1 To $aArray[0]
ExitLoop ExitLoop
EndIf EndIf
Next Next
If $PathEr > 1 Then If $PathEr > 1 Then
MsgBox(48, 'Предупреждение!', 'В системе больше одной папки с образами. Проверьте и удалите лишние (читаем ReadMe.txt). Система будет перезагружена.') MsgBox(48, 'Предупреждение!', 'В системе больше одной папки с образами. Проверьте и удалите лишние (читаем ReadMe.txt). Система будет перезагружена.')
Exit Exit
EndIf EndIf
For $i = 1 To $aArray[0] For $i = 1 To $aArray[0]
$aFileList = _FileListToArrayRec($aArray[$i] & "\efi\Paravis\Boot\kitchen", "NOT.DEL", $FLTAR_FILES, $FLTAR_RECUR, $FLTAR_NOSORT, $FLTAR_FULLPATH) $aFileList = _FileListToArrayRec($aArray[$i] & "\efi\Paravis\Boot", "NOT.DEL", $FLTAR_FILES, $FLTAR_RECUR, $FLTAR_NOSORT, $FLTAR_FULLPATH)
If Not @error Then If Not @error Then
$sDiskS = $aArray[$i] & "\efi\Paravis\Boot\" $sDiskS = $aArray[$i] & "\efi\Paravis\Boot"
ExitLoop ExitLoop
EndIf EndIf
Next Next
$ESD11 = $sDisk & "install_11.esd" $ESD11 = $sDisk & "install_11.esd"
$ESD10x64 = $sDisk & "install_10_x64.esd" $ESD10x64 = $sDisk & "install_10_x64.esd"
$ESD10x86 = $sDisk & "install_10_x86.esd" $ESD10x86 = $sDisk & "install_10_x86.esd"
@ -74,16 +68,13 @@ $OEM10x86 = " /m:" & $sDisk & "$OEM10x86$"
$OEM7x64 = " /m:" & $sDisk & "$OEM7x64$" $OEM7x64 = " /m:" & $sDisk & "$OEM7x64$"
$OEM7x86 = " /m:" & $sDisk & "$OEM7x86$" $OEM7x86 = " /m:" & $sDisk & "$OEM7x86$"
$setup = "X:\sources\setup.exe /installfrom:" $setup = "X:\sources\setup.exe /installfrom:"
If FileExists(@WindowsDir & "\SYSWOW64") Then If FileExists(@WindowsDir & "\SYSWOW64") Then
RunWait($sDiskS & "src_x64.exe auto2") RunWait($sDiskS & "\src_x64.exe auto2")
_x64() _x64()
Else Else
RunWait($sDiskS & "src_x86.exe auto2") RunWait($sDiskS & "\src_x86.exe auto2")
_x86() _x86()
EndIf EndIf
Func _x86() Func _x86()
$detect_efi = EnvGet("firmware_type") $detect_efi = EnvGet("firmware_type")
If $detect_efi = "Legacy" Then If $detect_efi = "Legacy" Then
@ -102,9 +93,7 @@ Func _x86()
$iBtnR = GUICtrlCreateButton("Перезагрузка", 5, 145, 350, 40) $iBtnR = GUICtrlCreateButton("Перезагрузка", 5, 145, 350, 40)
GUICtrlSetFont(-1, 16, 500, 0, $font) GUICtrlSetFont(-1, 16, 500, 0, $font)
GUISetState() GUISetState()
_checkesd86() _checkesd86()
While 1 While 1
Switch GUIGetMsg() Switch GUIGetMsg()
Case $GUI_EVENT_CLOSE Case $GUI_EVENT_CLOSE
@ -119,7 +108,7 @@ Func _x86()
GUISetState(@SW_SHOW) GUISetState(@SW_SHOW)
Case $iBtnTC Case $iBtnTC
GUISetState(@SW_HIDE) GUISetState(@SW_HIDE)
RunWait($sDiskS & 'kitchen\TotalCommander\TOTALCMD.EXE /I="%%COMMANDER_PATH%%\tcmdmain.ini"') RunWait($sDiskS & '\TotalCommander\TOTALCMD.EXE /I="%%COMMANDER_PATH%%\tcmdmain.ini"')
GUISetState(@SW_SHOW) GUISetState(@SW_SHOW)
Case $iBtnR Case $iBtnR
Exit Exit
@ -143,7 +132,6 @@ Func _x86()
$iBtnR = GUICtrlCreateButton("Перезагрузка", 5, 105, 350, 40) $iBtnR = GUICtrlCreateButton("Перезагрузка", 5, 105, 350, 40)
GUICtrlSetFont(-1, 16, 500, 0, $font) GUICtrlSetFont(-1, 16, 500, 0, $font)
GUISetState() GUISetState()
While 1 While 1
Switch GUIGetMsg() Switch GUIGetMsg()
Case $GUI_EVENT_CLOSE Case $GUI_EVENT_CLOSE
@ -154,7 +142,7 @@ Func _x86()
GUISetState(@SW_SHOW) GUISetState(@SW_SHOW)
Case $iBtnTC Case $iBtnTC
GUISetState(@SW_HIDE) GUISetState(@SW_HIDE)
RunWait($sDiskS & 'kitchen\TotalCommander\TOTALCMD.EXE /I="%%COMMANDER_PATH%%\tcmdmain.ini"') RunWait($sDiskS & '\TotalCommander\TOTALCMD.EXE /I="%%COMMANDER_PATH%%\tcmdmain.ini"')
GUISetState(@SW_SHOW) GUISetState(@SW_SHOW)
Case $iBtnR Case $iBtnR
Exit Exit
@ -162,7 +150,6 @@ Func _x86()
WEnd WEnd
EndIf EndIf
EndFunc EndFunc
Func _x64() Func _x64()
$hGUI = GUICreate("Windows Setup by Paravis", 410, 250, -1, -1, $WS_POPUP, $WS_EX_LAYERED) $hGUI = GUICreate("Windows Setup by Paravis", 410, 250, -1, -1, $WS_POPUP, $WS_EX_LAYERED)
GUISetBkColor(0xABCDEF) GUISetBkColor(0xABCDEF)
@ -181,9 +168,7 @@ Func _x64()
$iBtnR = GUICtrlCreateButton("Перезагрузка", 5, 185, 350, 40) $iBtnR = GUICtrlCreateButton("Перезагрузка", 5, 185, 350, 40)
GUICtrlSetFont(-1, 16, 500, 0, $font) GUICtrlSetFont(-1, 16, 500, 0, $font)
GUISetState() GUISetState()
_checkesd64() _checkesd64()
While 1 While 1
Switch GUIGetMsg() Switch GUIGetMsg()
Case $GUI_EVENT_CLOSE Case $GUI_EVENT_CLOSE
@ -202,14 +187,13 @@ Func _x64()
GUISetState(@SW_SHOW) GUISetState(@SW_SHOW)
Case $iBtnTC Case $iBtnTC
GUISetState(@SW_HIDE) GUISetState(@SW_HIDE)
RunWait($sDiskS & 'kitchen\TotalCommander\TOTALCMD64.EXE /I="%%COMMANDER_PATH%%\tcmdmain.ini"') RunWait($sDiskS & '\TotalCommander\TOTALCMD64.EXE /I="%%COMMANDER_PATH%%\tcmdmain.ini"')
GUISetState(@SW_SHOW) GUISetState(@SW_SHOW)
Case $iBtnR Case $iBtnR
Exit Exit
EndSwitch EndSwitch
WEnd WEnd
EndFunc EndFunc
Func _checkesd64() Func _checkesd64()
If Not FileExists($sDisk & "install_11.esd") Then If Not FileExists($sDisk & "install_11.esd") Then
GUICtrlSetState($iBtn11, $GUI_DISABLE) GUICtrlSetState($iBtn11, $GUI_DISABLE)
@ -221,7 +205,6 @@ Func _checkesd64()
GUICtrlSetState($iBtn7, $GUI_DISABLE) GUICtrlSetState($iBtn7, $GUI_DISABLE)
EndIf EndIf
EndFunc EndFunc
Func _checkesd86() Func _checkesd86()
If Not FileExists($sDisk & "install_10_x86.esd") Then If Not FileExists($sDisk & "install_10_x86.esd") Then
GUICtrlSetState($iBtn10, $GUI_DISABLE) GUICtrlSetState($iBtn10, $GUI_DISABLE)

Write Preview
Loading…
Cancel
Save