Commit 51ae3a0b by Csók Tamás

Selenium dependency solved

parent e5887644
......@@ -40,8 +40,7 @@ if '%errorlevel%' NEQ '0' (
:UACPrompt
echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
set params = %*:"=""
echo UAC.ShellExecute "cmd.exe", "/c %~s0 %params%", "", "runas", 1 >> "%temp%\getadmin.vbs"
echo UAC.ShellExecute "cmd.exe", "/c %~s0 !output_on_screen! !install_selenium! ^"!site!^"", "", "runas", 1 >> "%temp%\getadmin.vbs"
"%temp%\getadmin.vbs"
del "%temp%\getadmin.vbs"
......
......@@ -25,8 +25,8 @@ DisableDirPage=yes
DefaultGroupName={#MyAppName}
AllowNoIcons=yes
OutputBaseFilename=setup
SetupIconFile=C:\Users\Godhak\Desktop\client\dist\cloud.ico
UninstallIconFile=C:\Users\Godhak\Desktop\client\dist\cloud.ico
SetupIconFile=installer\cloud.ico
UninstallIconFile=installer\cloud.ico
Compression=lzma
SolidCompression=yes
......
......@@ -5,10 +5,6 @@
# A cloudban létrehozott virtuális gépekhez történő kapcsolódást segítő program
##
from selenium import webdriver
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
import platform, argparse, sys, time
##
......@@ -145,7 +141,11 @@ def main():
vm.protocol, vm.user, vm.password, vm.host, vm.port = args.uri.split(':',4)
vm.protocol = vm.protocol.upper()
vm.state = "RUN"
else:
else:
from selenium import webdriver
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
browser = Browser(args)
try:
if args.old:
......
......@@ -40,8 +40,7 @@ if '%errorlevel%' NEQ '0' (
:UACPrompt
echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
set params = %*:"=""
echo UAC.ShellExecute "cmd.exe", "/c %~s0 %params%", "", "runas", 1 >> "%temp%\getadmin.vbs"
echo UAC.ShellExecute "cmd.exe", "/c %~s0 !output_on_screen! !install_selenium! ^"!site!^"", "", "runas", 1 >> "%temp%\getadmin.vbs"
"%temp%\getadmin.vbs"
del "%temp%\getadmin.vbs"
......
......@@ -5,10 +5,6 @@
# A cloudban létrehozott virtuális gépekhez történő kapcsolódást segítő program
##
from selenium import webdriver
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
import platform, argparse, sys, time
##
......@@ -145,7 +141,11 @@ def main():
vm.protocol, vm.user, vm.password, vm.host, vm.port = args.uri.split(':',4)
vm.protocol = vm.protocol.upper()
vm.state = "RUN"
else:
else:
from selenium import webdriver
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
browser = Browser(args)
try:
if args.old:
......
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