From 49231a7bde1b604afc9976eaf6944e769f8854ec Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Sun, 19 Apr 2015 17:20:08 +0200
Subject: [PATCH] labs: protect downloader.js from deletion

In its current location, the download helper for Window batch scripts,
downloader.js, gets deleted when the Windows batch scripts are generated
(due to a call to clean_dir).

This patch moves downloader.js to the tools directory where it remains
safe from clean_dir.

Change-Id: I48f3daf613e8517dfb9256af298e9e43f76289bc
---
 labs/lib/wbatch/template-begin_base_bat | 2 +-
 labs/lib/wbatch/template-mkdirs_bat     | 1 +
 labs/{wbatch => tools}/downloader.js    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename labs/{wbatch => tools}/downloader.js (86%)

diff --git a/labs/lib/wbatch/template-begin_base_bat b/labs/lib/wbatch/template-begin_base_bat
index 80a09683..33d558c9 100644
--- a/labs/lib/wbatch/template-begin_base_bat
+++ b/labs/lib/wbatch/template-begin_base_bat
@@ -14,7 +14,7 @@ ECHO.
 ECHO Expect this to take several minutes or longer, depending on your
 ECHO Internet connection.
 ECHO.
-cscript /nologo downloader.js %ISOURL%
+cscript /nologo %TOOLSDIR%\downloader.js %ISOURL%
 RENAME downloaded.bin %INSTALLFILE%
 MOVE %INSTALLFILE% %IMGDIR%
 IF EXIST %IMGDIR%\%INSTALLFILE% goto got_install_iso
diff --git a/labs/lib/wbatch/template-mkdirs_bat b/labs/lib/wbatch/template-mkdirs_bat
index cf18e1e5..192240d4 100644
--- a/labs/lib/wbatch/template-mkdirs_bat
+++ b/labs/lib/wbatch/template-mkdirs_bat
@@ -8,6 +8,7 @@ SET IMGDIR=%TOPDIR%\%P_IMGDIR%
 SET LOGDIR=%TOPDIR%\%P_LOGDIR%
 SET STATUSDIR=%TOPDIR%\%P_STATUSDIR%
 SET SHAREDIR=%TOPDIR%
+SET TOOLSDIR=%TOPDIR%\tools
 
 ECHO %time% Creating directories (if needed)
 IF NOT EXIST %AUTODIR% mkdir %AUTODIR%
diff --git a/labs/wbatch/downloader.js b/labs/tools/downloader.js
similarity index 86%
rename from labs/wbatch/downloader.js
rename to labs/tools/downloader.js
index 9e0bbe7b..597c6c16 100644
--- a/labs/wbatch/downloader.js
+++ b/labs/tools/downloader.js
@@ -1,5 +1,6 @@
 /* Taken from http://superuser.com/a/536400 */
 /* Use: cscript /nologo downloader.js <URL> */
+/* Used by Windows batch scripts to download distro ISO image */
 
 var WinHttpReq = new ActiveXObject("WinHttp.WinHttpRequest.5.1");
 WinHttpReq.Open("GET", WScript.Arguments(0), /*async=*/false);