FAQ | This is a LIVE service | Changelog

Skip to content
Snippets Groups Projects
Commit 15b0a177 authored by Mr Chris B Mortimer's avatar Mr Chris B Mortimer
Browse files

Merge branch 'update_script_vars' into 'master'

Update script vars

See merge request !2
parents c22b2b88 ec6d1b1c
No related branches found
No related tags found
1 merge request!2Update script vars
......@@ -12,9 +12,14 @@ Full UNC path to 64-bit wpkg64.js
Agreed-upon code your institution (see below)
1. WPKGSOFTWARE
Full UNC path to the central software repository.
1. WPKGSOFTWAREUSER
Username that should be used for connecting to WPKGSOFTWARE
1. WPKGSOFTWAREPASSWORD
Password that should be used for connecting to WPKGSOFTWARE as WPKGSOFTWAREUSER
1. WPKGLOGDIR
Directory in which software installer logs are to be kept
The included wpkg wrapper script will look in HKLM\SOFWARE\WPKG\vars and set environment variables for all keys of type REG_SZ, so you could e.g.
reg add HKLM\SOFTWARE\WPKG\vars /v WPKGINSTITUTION /t REG_SZ /d chemistry
......
@echo off
set IFS=ifs.ch.private.cam.ac.uk
set WPKG_REG=HKLM\Software\WPKG\vars
::WPKG variables defined in the registry as set per group policy. Allows for per department variables to be defined
......@@ -11,12 +10,13 @@ if /i "%WPKGJS%"=="" echo.The value of %%WPKGJS%% is blank, not allowed&exit /b
if /i "%WPKGJS64%"=="" echo.The value of %%WPKGJS64%% is blank, not allowed&exit /b
if /i "%WPKGINSTITUTION%"=="" echo.The value of %%WPKGINSTITUTION%% is blank, not allowed&exit /b
if /i "%WPKGSOFTWARE%"=="" echo.The value of %%WPKGSOFTWARE%% is blank, not allowed&exit /b
if /i "%WPKGSOFTWAREUSER%"=="" echo.The value of %%WPKGSOFTWAREUSER%% is blank, not allowed&exit /b
if /i "%WPKGSOFTWAREPASSWORD%"=="" echo.The value of %%WPKGSOFTWAREPASSWORD%% is blank, not allowed&exit /b
if /i "%WPKGLOGDIR%"=="" echo.The value of %%WPKGLOGDIR%% is blank, not allowed&exit /b
if /i "%IFSNODE%"=="" echo.The value of %%WPKGLOGDIR%% is blank, not allowed&exit /b
if NOT exist %WPKGLOGDIR% mkdir %WPKGLOGDIR%
net use * \\%IFS%\deploy\software /user:deploy-share-reader@ad.ch.cam.ac.uk %IFSNODE% >nul 2>&1
net use * %WPKGSOFTWARE% /user:%WPKGSOFTWAREUSER% %WPKGSOFTWAREPASSWORD% >nul 2>&1
if exist "%programfiles(x86)%" (goto 64bit) else (goto 32bit)
......@@ -33,8 +33,8 @@ cscript //E:jscript //nologo %WPKGJS64% %*
goto end
:end
::remove the IFS share
FOR /F "tokens=2" %%D IN ('net use ^| find "%IFS%"') DO net use %%D /d >nul 2>&1
::remove the WPKGSOFTWARE share
FOR /F "tokens=2" %%D IN ('net use ^| find "%WPKGSOFTWARE%"') DO net use %%D /d >nul 2>&1
::clear the variables set at the top of this scripts
for /f "tokens=1,2,3" %%a in ('reg query %WPKG_REG%') do (
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment