From f9f28662eb47ebbb8f7e07def7bac77397bee47e Mon Sep 17 00:00:00 2001
From: Sylvain Cadilhac <sylvain.cadilhac@netshot.net>
Date: Thu, 18 Apr 2024 22:36:22 +0200
Subject: [PATCH] Netscaler: remove previous archive

---
 src/main/resources/drivers/Citrix_Netscaler.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/drivers/Citrix_Netscaler.js b/src/main/resources/drivers/Citrix_Netscaler.js
index a3b832a8..0e594c0f 100644
--- a/src/main/resources/drivers/Citrix_Netscaler.js
+++ b/src/main/resources/drivers/Citrix_Netscaler.js
@@ -21,7 +21,7 @@ var Info = {
 	name: "CitrixNetscaler",
 	description: "Citrix NetScaler",
 	author: "NetFishers",
-	version: "2.0"
+	version: "2.1"
 };
 
 var Config = {
@@ -92,7 +92,7 @@ var CLI = {
 	},
 	cli: {
 		prompt: /^([^\s\r\n]*( \((Primary|Secondary)\))?> )$/,
-		error: /^ERROR: /m,
+		error: /^ERROR: (.*)/m,
 		pager: {
 			avoid: "set cli mode -page OFF",
 			match: /^.--More--/,
@@ -321,6 +321,18 @@ function snapshot(cli, device, config) {
 	}
 	config.set("runningConfig", runningConfig);
 
+	// Delete any legacy backup archive
+	try {
+		cli.command("rm system backup netshot.tgz");
+	}
+	catch (e) {
+		if (String(e).match(/Backup file does not exist/)) {
+			// ignore
+		}
+		else {
+			throw e;
+		}
+	}
 	// Create a backup archive
 	const backupOutput = cli.command("create system backup -level full netshot");
 	if (!backupOutput.match(/Done/)) {
@@ -334,7 +346,7 @@ function snapshot(cli, device, config) {
 		throw e;
 	}
 	finally {
-		cli.command("rm system backup netshot.tgz")
+		cli.command("rm system backup netshot.tgz");
 	}
 };