Commit 2772502f by Csók Tamás

client: script case corrections

parent 8a8e82c9
......@@ -33,10 +33,10 @@
;--------------------------------
;General
!macro Explode Length Separator String
Push `${Separator}`
Push `${String}`
Push '${Separator}'
Push '${String}'
Call Explode
Pop `${Length}`
Pop '${Length}'
!macroend
!macro StrCase ResultVar String Case
Push "${String}"
......@@ -46,9 +46,9 @@
!macroend
!macro GetDrivesCaller _DRV _FUNC
Push $0
Push `${_DRV}`
GetFunctionAddress $0 `${_FUNC}`
Push `$0`
Push '${_DRV}'
GetFunctionAddress $0 '${_FUNC}'
Push '$0'
Call Drives
Pop $0
!macroend
......@@ -307,7 +307,7 @@ SectionGroup /e $(NAME_Functions)
StrCmp $found_python "true" appendExec
Goto LookupEnd
appendExec:
StrCpy $append ' $python_version $python_architect "$python_location\"'
StrCpy $append ' $python_architect $python_version "$python_location\"'
LookupEnd:
SectionEnd
SectionGroupEnd
......@@ -380,7 +380,7 @@ Function PythonSearch
${Else}
PythonNotFound:
MessageBox MB_OK $(STATUS_PythonNotFound)
Abort $(STATUS_PythonNotFound)
DetailPrint $(STATUS_PythonNotFound)
Goto PythonFin
${EndIf}
......@@ -393,8 +393,9 @@ Function PythonSearch
${StrTrimNewLines} $python_architect $0
DetailPrint '$(STATUS_PythonArchitectFound) $python_architectbit'
${Else}
StrCpy $found_python "false"
MessageBox MB_OK $(STATUS_PythonArchitectNotFound)
Abort $(STATUS_PythonArchitectNotFound)
DetailPrint $(STATUS_PythonArchitectNotFound)
${EndIf}
StrCpy $6 StopGetDrives
PythonFin:
......
......@@ -34,18 +34,18 @@ IF NOT "%4"=="" (
SET my_site=!site:"=!
SET "website= -t ^"!my_site!^""
rem Set Python version if we know it
rem Set Python bit count (32 or 64) if we know it
IF NOT "%5"=="" (
SET "version=%5"
SET "architecture=%5"
) else (
SET "version="
SET "architecture="
)
rem Set Python bit count (32 or 64) if we know it
rem Set Python version if we know it
IF NOT "%6"=="" (
SET "architecture=%6"
SET "version=%6"
) else (
SET "architecture="
SET "version="
)
rem Set Python location if we know it
......@@ -74,7 +74,7 @@ if '%errorlevel%' NEQ '0' (
echo Set UAC = CreateObject^("Shell.Application"^) > ^"%temp%\getadmin.vbs^"
set vbs_site=!site:"=""!
set vbs_installpath=!python_location:"=""!
echo UAC.ShellExecute "cmd.exe", "/c %~s0 !install_location! !output_on_screen! !install_nx! !vbs_site! !version! !architecture! !vbs_installpath!", "", "runas", 1 >> "%temp%\getadmin.vbs"
echo UAC.ShellExecute "cmd.exe", "/c %~s0 !install_location! !output_on_screen! !install_nx! !vbs_site! !architecture! !version! !vbs_installpath!", "", "runas", 1 >> "%temp%\getadmin.vbs"
^"%temp%\getadmin.vbs^"
del "%temp%\getadmin.vbs"
......@@ -117,7 +117,6 @@ SET index=8
if "!architecture!"=="64" (
if "%python_registry%"=="" (
SET "python_registry=Wow6432Node\"
SET "architecture=32"
GOTO PYTHON_CHECK
) else (
GOTO NOPYTHON
......@@ -217,6 +216,9 @@ IF NOT "!output_on_screen!"=="False" (
@echo !version! Python was installed but it is NOT now. Restarting the search for python^^!
goto loop
) else (
IF "!python_registry!"=="Wow6432Node\" (
SET "architecture=32"
)
set test=%install_path:~0,-1%
call ^"%running_directory%inPath^" ^"test^" && (IF NOT "!output_on_screen!"=="False" (@echo !test! is already in PATH>CON) && @echo !test! is already in PATH) || (call ^"%running_directory%addPath^" ^"test^" & setx>nul PATH "%PATH%;!test!" /m & IF NOT "!output_on_screen!"=="False" ( @echo !test! set to PATH>CON) && @echo !test! set to PATH)
set test=%install_path%Scripts
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment