From 3504b0cd59dcad3055d932d537e314414011e694 Mon Sep 17 00:00:00 2001
From: Rashil Gandhi <rashil2000@gmail.com>
Date: Mon, 20 Dec 2021 01:26:33 +0530
Subject: [PATCH] nmap: Use portable version as default

---
 bucket/nmap-portable.json | 44 ---------------------------------------
 bucket/nmap.json          | 33 ++++++++++++++++-------------
 deprecated/nmap.json      | 42 +++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 59 deletions(-)
 delete mode 100644 bucket/nmap-portable.json
 create mode 100644 deprecated/nmap.json

diff --git a/bucket/nmap-portable.json b/bucket/nmap-portable.json
deleted file mode 100644
index 01a88fc330..0000000000
--- a/bucket/nmap-portable.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "version": "7.92",
-    "description": "Network exploration and security auditing utility.",
-    "homepage": "https://nmap.org",
-    "license": {
-        "identifier": "GPL-2.0-only",
-        "url": "https://github.com/nmap/nmap/blob/master/COPYING"
-    },
-    "notes": [
-        "Please install 'Npcap' by manually running '$dir\\npcap-oem.exe'!",
-        "Please import the network performance improvements by running 'regedt32 \"$dir\\nmap_performance.reg\"'",
-        "See: https://nmap.org/book/inst-windows.html"
-    ],
-    "suggest": {
-        "Visual C++ Redist 2008": "extras/vcredist2008"
-    },
-    "url": "https://nmap.org/dist/nmap-7.92-setup.exe#/dl.7z",
-    "hash": "b2400db1a4af9607fdd6ee50e0f5926d8b9272f89eec93d4c30b56dc854afb7a",
-    "pre_install": [
-        "Get-ChildItem \"$dir\\`$PLUGINSDIR\\npcap-*.exe\" | Select-Object -First 1 | Rename-Item -NewName 'npcap-oem.exe'",
-        "Move-Item \"$dir\\`$PLUGINSDIR\\npcap-oem.exe\" \"$dir\"",
-        "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\Uninstall.exe\" -Recurse"
-    ],
-    "bin": [
-        "nmap.exe",
-        "ncat.exe",
-        "ndiff.exe",
-        "zenmap.exe",
-        "nping.exe"
-    ],
-    "shortcuts": [
-        [
-            "zenmap.exe",
-            "Nmap - Zenmap GUI"
-        ]
-    ],
-    "checkver": {
-        "url": "https://nmap.org/download.html",
-        "regex": "nmap-([\\d.]+)-setup\\.exe"
-    },
-    "autoupdate": {
-        "url": "https://nmap.org/dist/nmap-$version-setup.exe#/dl.7z"
-    }
-}
diff --git a/bucket/nmap.json b/bucket/nmap.json
index c18fd66900..20a258d1e1 100644
--- a/bucket/nmap.json
+++ b/bucket/nmap.json
@@ -1,24 +1,27 @@
 {
     "version": "7.92",
-    "description": "Network exploration and security auditing utility. (includes Npcap)",
+    "description": "Network exploration and security auditing utility.",
     "homepage": "https://nmap.org",
     "license": {
         "identifier": "GPL-2.0-only",
         "url": "https://github.com/nmap/nmap/blob/master/COPYING"
     },
-    "notes": "'Npcap' has been installed automatically.",
-    "url": "https://nmap.org/dist/nmap-7.92-setup.exe",
+    "notes": [
+        "Please install 'Npcap' by manually running '$dir\\npcap.exe', otherwise Nmap will not function completely!",
+        "This however, requires administrator rights.",
+        "Please import the network performance improvements by running 'regedt32 \"$dir\\nmap_performance.reg\"'",
+        "See: https://nmap.org/book/inst-windows.html"
+    ],
+    "suggest": {
+        "Visual C++ Redist 2008": "extras/vcredist2008"
+    },
+    "url": "https://nmap.org/dist/nmap-7.92-setup.exe#/dl.7z",
     "hash": "b2400db1a4af9607fdd6ee50e0f5926d8b9272f89eec93d4c30b56dc854afb7a",
-    "installer": {
-        "args": [
-            "/S",
-            "/D=$dir"
-        ]
-    },
-    "uninstaller": {
-        "file": "Uninstall.exe",
-        "args": "/S"
-    },
+    "pre_install": [
+        "Get-ChildItem \"$dir\\`$PLUGINSDIR\\npcap-*.exe\" | Select-Object -First 1 | Rename-Item -NewName 'npcap.exe'",
+        "Move-Item \"$dir\\`$PLUGINSDIR\\npcap.exe\" \"$dir\"",
+        "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\Uninstall.exe\" -Recurse"
+    ],
     "bin": [
         "nmap.exe",
         "ncat.exe",
@@ -29,7 +32,7 @@
     "shortcuts": [
         [
             "zenmap.exe",
-            "Nmap - Zenmap GUI"
+            "Zenmap - Nmap GUI"
         ]
     ],
     "checkver": {
@@ -37,6 +40,6 @@
         "regex": "nmap-([\\d.]+)-setup\\.exe"
     },
     "autoupdate": {
-        "url": "https://nmap.org/dist/nmap-$version-setup.exe"
+        "url": "https://nmap.org/dist/nmap-$version-setup.exe#/dl.7z"
     }
 }
diff --git a/deprecated/nmap.json b/deprecated/nmap.json
new file mode 100644
index 0000000000..c18fd66900
--- /dev/null
+++ b/deprecated/nmap.json
@@ -0,0 +1,42 @@
+{
+    "version": "7.92",
+    "description": "Network exploration and security auditing utility. (includes Npcap)",
+    "homepage": "https://nmap.org",
+    "license": {
+        "identifier": "GPL-2.0-only",
+        "url": "https://github.com/nmap/nmap/blob/master/COPYING"
+    },
+    "notes": "'Npcap' has been installed automatically.",
+    "url": "https://nmap.org/dist/nmap-7.92-setup.exe",
+    "hash": "b2400db1a4af9607fdd6ee50e0f5926d8b9272f89eec93d4c30b56dc854afb7a",
+    "installer": {
+        "args": [
+            "/S",
+            "/D=$dir"
+        ]
+    },
+    "uninstaller": {
+        "file": "Uninstall.exe",
+        "args": "/S"
+    },
+    "bin": [
+        "nmap.exe",
+        "ncat.exe",
+        "ndiff.exe",
+        "zenmap.exe",
+        "nping.exe"
+    ],
+    "shortcuts": [
+        [
+            "zenmap.exe",
+            "Nmap - Zenmap GUI"
+        ]
+    ],
+    "checkver": {
+        "url": "https://nmap.org/download.html",
+        "regex": "nmap-([\\d.]+)-setup\\.exe"
+    },
+    "autoupdate": {
+        "url": "https://nmap.org/dist/nmap-$version-setup.exe"
+    }
+}