diff --git a/banner.png b/banner.png deleted file mode 100644 index f2f72e7..0000000 Binary files a/banner.png and /dev/null differ diff --git a/launcher.bat b/launcher.bat index 0ea6e48..fc4c591 100644 --- a/launcher.bat +++ b/launcher.bat @@ -3,14 +3,7 @@ echo Updating tools... cd /d C:\tools -powershell -NoProfile -Command ^ - "$p = Start-Process 'git' 'pull' -PassThru -NoNewWindow; ^ - if (-not $p.WaitForExit(10*1000)) { try { $p.Kill() } catch {} ; exit 1 } ^ - exit $p.ExitCode" - -if errorlevel 1 ( - echo Git pull failed/timed out (offline?). Continuing... -) +git pull echo Starting... cd /d C:\magicis\agent diff --git a/magicis-install.ps1 b/magicis-install.ps1 index bd2a98f..f1a6959 100644 --- a/magicis-install.ps1 +++ b/magicis-install.ps1 @@ -17,7 +17,7 @@ if (-not ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdent $ConfigDir = 'C:\magicis' $ConfigPath = Join-Path $ConfigDir 'config.json' $AgentBat = Join-Path $ConfigDir 'agent.bat' -$ShellPath = 'c:\magicis\launcher.bat' +$ShellPath = 'cmd.exe /c c:\magicis\launcher.bat' $KioskUser = 'magicis' $KioskPass = '124578Magicis'