From c119d4e780d497bf0281a0ddc3c85c737ade9b7e Mon Sep 17 00:00:00 2001
From: Luis Blanco <blanco@ucoz-team.net>
Date: Tue, 30 Jan 2018 18:09:26 +0300
Subject: [PATCH] wip

---
 README.md             | 28 ++++++++++++++--------------
 _del.bat              |  3 ---
 _rd.bat               |  3 ---
 index.js              |  5 ++---
 _md.bat => mkdirp.bat |  0
 rmrf.bat              | 13 +++++++++++++
 6 files changed, 29 insertions(+), 23 deletions(-)
 delete mode 100644 _del.bat
 delete mode 100644 _rd.bat
 rename _md.bat => mkdirp.bat (100%)
 create mode 100644 rmrf.bat

diff --git a/README.md b/README.md
index 15b91ae..fa2101b 100644
--- a/README.md
+++ b/README.md
@@ -42,9 +42,8 @@ dependency packages.
 
 ```
 'variables': {
-	'_rd' : '<!(node -e "console.log(require(\'addon-tools-raub\')._rd)")',
-	'_md' : '<!(node -e "console.log(require(\'addon-tools-raub\')._md)")',
-	'_del' : '<!(node -e "console.log(require(\'addon-tools-raub\')._del)")',
+	'rmrf' : '<!(node -e "console.log(require(\'addon-tools-raub\').rmrf)")',
+	'mkdirp' : '<!(node -e "console.log(require(\'addon-tools-raub\').mkdirp)")',
 },
 ```
 
@@ -173,8 +172,9 @@ If you always copy your compiled addon to the `binary` directory, it will be eas
 				'<(module_root_dir)/binary/MY_ADDON.node'
 			] } ],
 			[ 'OS=="win"', { 'action' : [
-				'copy "<(module_root_dir)/build/Release/MY_ADDON.node"' +
-				' "<(module_root_dir)/binary/MY_ADDON.node"'
+				'copy',
+				'<(module_root_dir)/build/Release/MY_ADDON.node' +
+				'<(module_root_dir)/binary/MY_ADDON.node'
 			] } ],
 		],
 	}],
@@ -533,25 +533,25 @@ input `dir`.
 	* `include` - include directory for this `dir`.
 * `root` - where `'addon-tools-raub'` module is situated.
 * `include` - `'addon-tools-raub'` own 'include' directory.
-* `_rd` - the location of `'_rd.bat'` file.
-* `_md` - the location of `'_md.bat'` file.
-* `_del` - the location of `'_del.bat'` file.
+* `rmrf` - the location of `'rmrf.bat'` file.
+* `mkdirp` - the location of `'mkdirp.bat'` file.
 
 
 ---
 
 ## Windows BAT
 
-Windows-only utilities. Because in gyp any `/` on Windows is converted to `\`, it is
-impossible to put correct commands for file/directory removal. Those need such
-parameters as `/Q`, but gyp makes them `\Q` which is inappropriate. So these files
-simply contain their respective commands with all necessary parameters, avoiding any
-conflict with gyp.
+Windows-only utilities. Disregard `del` vs `rd` aspect of Windows command line.
+Now 
 
 Also on Windows there is no `mkdir -p`, hence if directory exists you get an error
 trying to make it great again with `md`.
 
 ```
+'variables': {
+	'rmrf' : '<!(node -e "console.log(require(\'addon-tools-raub\').rmrf)")',
+	'mkdirp' : '<!(node -e "console.log(require(\'addon-tools-raub\').mkdirp)")',
+},
 ...
 [ 'OS=="mac"', { 'action' : [
 	'rm',
@@ -559,7 +559,7 @@ trying to make it great again with `md`.
 	'<(module_root_dir)/build/Release/addon.node'
 ] } ],
 [ 'OS=="win"', { 'action' : [
-	'<(_del)',
+	'<(rmrf)',
 	'<(module_root_dir)/build/Release/addon.*',
 	'<(module_root_dir)/build/Release/obj/addon/*.*'
 ] } ],
diff --git a/_del.bat b/_del.bat
deleted file mode 100644
index 2db053e..0000000
--- a/_del.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-for %%x in (%*) do (
-	if exist %%x del /f /q %%x
-)
diff --git a/_rd.bat b/_rd.bat
deleted file mode 100644
index a2706f5..0000000
--- a/_rd.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-for %%x in (%*) do (
-	if exist %%x rd /s /q %%x
-)
diff --git a/index.js b/index.js
index 972c3a2..ee64e27 100644
--- a/index.js
+++ b/index.js
@@ -49,8 +49,7 @@ module.exports = {
 	
 	printNan() { require('nan'); },
 	
-	_rd  :`${thisDir}/_rd.bat`,
-	_md  :`${thisDir}/_md.bat`,
-	_del :`${thisDir}/_del.bat`,
+	mkdirp : `${thisDir}/mkdirp.bat`,
+	rmrf   : `${thisDir}/rmrf.bat`,
 	
 };
diff --git a/_md.bat b/mkdirp.bat
similarity index 100%
rename from _md.bat
rename to mkdirp.bat
diff --git a/rmrf.bat b/rmrf.bat
new file mode 100644
index 0000000..d7d4e2f
--- /dev/null
+++ b/rmrf.bat
@@ -0,0 +1,13 @@
+for %%x in (%*) do (
+	
+	if %%x=="-r" goto continue
+	if %%x=="-f" goto continue
+	if %%x=="-rf" goto continue
+	
+	if exist %%~x\ rd /s /q %%x
+	if not exist %%~x\ if exist %%x del /f /q %%x
+	
+	:continue
+	rem
+	
+)