Skip to content

CIRCLE / client

Go to a project
Commit 72972bc8 by Csók Tamás
Options

client: zárójelezés javítása

parent 2e9ffd36
Showing with 29 additions and 28 deletions
src/nsi/installer/install.cmd
......@@ -4,13 +4,14 @@ setLocal EnableDelayedExpansion
rem Get the running directory for later ease of use
SET running_directory=%~dp0
rem Set where this file will install the rest of the files
IF NOT [%1]==[] (
SET "location=%1"
SET "location=%1"
IF NOT [!location!]==[] (
@echo sikerult
SET install_location=!location:"=!
) else (
SET "install_location=%APPDATA%\CIRCLE"
)
rem Set whether we want output info on screen or not
Set whether we want output info on screen or not
IF NOT [%2]==[] (
SET "output_on_screen=%2"
) else (
......@@ -49,8 +50,8 @@ IF NOT [%6]==[] (
)
rem Set Python location if we know it
IF NOT [%7]==[] (
SET "python_location=%7"
SET "python_location=%7"
IF NOT [!python_location!]==[] (
SET install_path=!python_location:"=!
) else (
SET "install_path="
......@@ -144,7 +145,7 @@ IF NOT "!output_on_screen!"=="False" (
@echo 64 bit system detected, commencing the install>CON
)
@echo 64 bit system detected, commencing the install
start "Phyton Installer" /WAIT ^"%running_directory%x64^\python-2.7.10.amd64.msi^"
start "Python Installer" /WAIT ^"!running_directory!x64^\python-2.7.10.amd64.msi^"
GOTO NOWHASPYTHON
)
if "!architecture!"=="32" (
......@@ -152,7 +153,7 @@ IF NOT "!output_on_screen!"=="False" (
@echo 32 bit system detected, commencing the install>CON
)
@echo 32 bit system detected, commencing the install
start "Phyton Installer" /WAIT ^"%running_directory%x86^\python-2.7.10.msi^"
start "Python Installer" /WAIT ^"!running_directory!x86^\python-2.7.10.msi^"
GOTO NOWHASPYTHON
)
GOTO ERR
......@@ -220,9 +221,9 @@ IF NOT "!output_on_screen!"=="False" (
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)
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
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)
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)
)
GOTO PIP_INSTALL
......@@ -231,7 +232,7 @@ IF NOT "!output_on_screen!"=="False" (
@echo Failed. Commencing installation of easy_install>CON
)
@echo Failed. Commencing installation of easy_install
CALL python ^"%running_directory%ez_setup.py^"
CALL python ^"!running_directory!ez_setup.py^"
IF NOT "!output_on_screen!"=="False" (
@echo Done.>CON
)
......@@ -279,7 +280,7 @@ IF NOT "!output_on_screen!"=="False" (
rem Try to install the PIP packages via PIP
:PIP_PACKAGE_INSTALL
if "!pip_program!"=="pywin32" (
call python ^"%running_directory%pywin_installer.py^" ^-m !architecture!
call python ^"!running_directory!pywin_installer.py^" ^-m !architecture!
) else (
call python -m pip install -r !pip_program!
)
......@@ -297,28 +298,28 @@ rem Finish up the install
:FIN
rem Create folder if needed and set it to PATH
IF NOT "!output_on_screen!"=="False" (
@echo Checking wheter ^'%install_location%^\^' exists already>CON
@echo Checking wheter ^'!install_location!^\^' exists already>CON
)
@echo Checking wheter ^'%install_location%^\^' exists already
call ^"%running_directory%inPath^" ^"install_location^" && (IF NOT "!output_on_screen!"=="False" ( @echo !install_location! is already in PATH>CON) && @echo !install_location! is already in PATH) || (call ^"%running_directory%addPath^" ^"install_location^" & setx>nul PATH "%PATH%;!install_location!" /m & IF NOT "!output_on_screen!"=="False" ( @echo !install_location! set to PATH>CON) && @echo !install_location! set to PATH)
if not exist "%install_location%\" (
mkdir ^"%install_location%^"
@echo Checking wheter ^'!install_location!^\^' exists already
call ^"!running_directory!inPath^" ^"install_location^" && (IF NOT "!output_on_screen!"=="False" ( @echo !install_location! is already in PATH>CON) && @echo !install_location! is already in PATH) || (call ^"!running_directory!addPath^" ^"install_location^" & setx>nul PATH "%PATH%;!install_location!" /m & IF NOT "!output_on_screen!"=="False" ( @echo !install_location! set to PATH>CON) && @echo !install_location! set to PATH)
if not exist "!install_location!\" (
mkdir ^"!install_location!^"
)
if not exist "%install_location%\.rdp\" (
mkdir ^"%install_location%\.rdp^"
if not exist "!install_location!\.rdp\" (
mkdir ^"!install_location!\.rdp^"
)
rem Copy the files to the folder
IF NOT "!output_on_screen!"=="False" (
@echo Copying files to ^'%install_location%^'>CON
@echo Copying files to ^'!install_location!^'>CON
)
@echo Copying files to ^'%install_location%^'
xcopy "%running_directory%cloud.py" "%install_location%\" /y
xcopy "%running_directory%cloud_connect_from_windows.py" "%install_location%\" /y
xcopy "%running_directory%win_install.py" "%install_location%\" /y
xcopy "%running_directory%windowsclasses.py" "%install_location%\" /y
xcopy "%running_directory%nxkey.py" "%install_location%\" /y
xcopy "%running_directory%OrderedDict.py" "%install_location%\" /y
xcopy "%running_directory%putty.exe" "%install_location%\" /y
@echo Copying files to ^'!install_location!^'
xcopy "!running_directory!cloud.py" "!install_location!\" /y
xcopy "!running_directory!cloud_connect_from_windows.py" "!install_location!\" /y
xcopy "!running_directory!win_install.py" "!install_location!\" /y
xcopy "!running_directory!windowsclasses.py" "!install_location!\" /y
xcopy "!running_directory!nxkey.py" "!install_location!\" /y
xcopy "!running_directory!OrderedDict.py" "!install_location!\" /y
xcopy "!running_directory!putty.exe" "!install_location!\" /y
IF NOT "!output_on_screen!"=="False" (
@echo Done>CON
@echo.>CON
......@@ -329,7 +330,7 @@ IF NOT "!output_on_screen!"=="False" (
@echo Starting the python installation script>CON
)
@echo Starting the python installation script
call python ^"%running_directory%win_install.py^"!nx_install! ^-l "%install_location%\\"!website!
call python ^"!running_directory!win_install.py^"!nx_install! ^-l "!install_location!\\"!website!
IF NOT "!output_on_screen!"=="False" (
@echo Done>CON
@echo Installation complete>CON
......
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