Selenium dependency solved

src/batch/install.bat

@@ -40,8 +40,7 @@ if '%errorlevel%' NEQ '0' (
 
 
 :UACPrompt
 :UACPrompt
     echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
     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"
     "%temp%\getadmin.vbs"
     del "%temp%\getadmin.vbs"
     del "%temp%\getadmin.vbs"

src/iss/cloud.iss

@@ -25,8 +25,8 @@ DisableDirPage=yes
 DefaultGroupName={#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 AllowNoIcons=yes
 OutputBaseFilename=setup
 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
 Compression=lzma
 SolidCompression=yes
 SolidCompression=yes
 
 

src/iss/installer/cloud.py

@@ -5,10 +5,6 @@
 # A cloudban létrehozott virtuális gépekhez történő kapcsolódást segítő program
 # 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
 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.user, vm.password, vm.host, vm.port = args.uri.split(':',4)
             vm.protocol = vm.protocol.upper()
             vm.protocol = vm.protocol.upper()
             vm.state = "RUN"
             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)
             browser = Browser(args)
             try:
             try:
                 if args.old:
                 if args.old:

src/iss/installer/install.bat

@@ -40,8 +40,7 @@ if '%errorlevel%' NEQ '0' (
 
 
 :UACPrompt
 :UACPrompt
     echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
     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"
     "%temp%\getadmin.vbs"
     del "%temp%\getadmin.vbs"
     del "%temp%\getadmin.vbs"

src/python/cloud.py

@@ -5,10 +5,6 @@
 # A cloudban létrehozott virtuális gépekhez történő kapcsolódást segítő program
 # 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
 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.user, vm.password, vm.host, vm.port = args.uri.split(':',4)
             vm.protocol = vm.protocol.upper()
             vm.protocol = vm.protocol.upper()
             vm.state = "RUN"
             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)
             browser = Browser(args)
             try:
             try:
                 if args.old:
                 if args.old: