From e2e255f6904d0f5ba81b242beacd0a91baa0763d Mon Sep 17 00:00:00 2001
From: adrien <adrien@malingrey.fr>
Date: Tue, 9 May 2023 15:27:40 +0200
Subject: [PATCH] merge

---
 nmap_cmd.xsl | 2 +-
 scan         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nmap_cmd.xsl b/nmap_cmd.xsl
index 2c20c54..5ee1519 100644
--- a/nmap_cmd.xsl
+++ b/nmap_cmd.xsl
@@ -10,7 +10,7 @@
 <xsl:template match="lanScan">
 <xsl:text>nmap -v -T4 -p </xsl:text>
 <xsl:apply-templates select="//service[not(.=preceding::*)]" />
-<xsl:text> --script "http-info.nse" -oX "</xsl:text>
+<xsl:text> --script nse/ -oX "</xsl:text>
 <xsl:value-of select="@scanpath"/>
 <xsl:text>.tmp" </xsl:text>
 <xsl:apply-templates select="//host"/>
diff --git a/scan b/scan
index 587408e..53b0bae 100755
--- a/scan
+++ b/scan
@@ -8,8 +8,8 @@ fi
 pushd "$(dirname -- "$0")" > /dev/null
 site="$(basename ${1/.yaml/})"
 
-php "to_XML.php" "configs/$site.yaml" > "site/$site.xml"
-eval $(xsltproc "nmap_cmd.xsl" "site/$site.xml")
-mv "scans/$site.xml.tmp" "scans/$site.xml"
+php "to_XML.php" "configs/$site.yaml" > "site/$site.xml" \
+&& eval $(xsltproc "nmap_cmd.xsl" "site/$site.xml") \
+&& mv "scans/$site.xml.tmp" "scans/$site.xml"
 
 popd  > /dev/null
\ No newline at end of file