From 3b1c73b73d5345e94bc76fd7c6f676c6c0252def Mon Sep 17 00:00:00 2001
From: Tobias Herre <tobias.herre@wikimedia.de>
Date: Wed, 1 Nov 2023 17:02:00 +0100
Subject: [PATCH] Does not always untar anymore

---
 roundcube.cf | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/roundcube.cf b/roundcube.cf
index 6b5fcba..37fe3d7 100644
--- a/roundcube.cf
+++ b/roundcube.cf
@@ -39,10 +39,10 @@ vars:
 		"dlsrc" string => "https://github.com/roundcube/roundcubemail/releases/download/$(cfg[version])/$(tgzname)";
 
 reports:
-	dlbyversion::
-		"dl by version";
-	!dlbyversion::
-		"not dl by version";
+#	dlbyversion::
+#		"dl by version";
+#	!dlbyversion::
+#		"not dl by version";
 	
 files:
 	"$(dldir)/."
@@ -52,8 +52,8 @@ files:
 methods:
 	"any" usebundle => download_file("$(dltype)","$(dlsrc)","$(dlfile)","roundcube_tgz_file",'{}'),
 	handle => "roundcube_tgz_copied",
-	depends_on => {"roundcube_agent_dir_created"},
-	classes => if_repaired ("roundcube_untar");
+	depends_on => {"roundcube_agent_dir_created"};
+#	classes => if_repaired ("roundcube_untar");
 
 
     #    "$(dlfile)"
@@ -76,22 +76,21 @@ files:
 	run_backups&config_exists::
 		"$(cfg[backup_dir])/config.inc.php"
 		copy_from => local_dcp("$(install_sub_dir)/config/config.inc.php"),
-		depends_on => {"roundcube_untarred"};	
-
+		depends_on => {"roundcube_untarred"};
 methods:
 	"any" usebundle => mysql_table_exists(@(cfg),"users");
 	
-	config_exists|roundcube_configr_repaired::
+	config_exists|roundcube_config_repaired::
 		"any" usebundle => rm_rf ("$(install_sub_dir)/installer");
 
 commands:
-	roundcube_untar::
+	roundcube_untar|roundcube_tgz_file_repaired::
 		"/usr/bin/tar"
 		args => "xzf $(dlfile) -C $(cfg[install_dir]) && chown -R $(cfg[www_user]):$(cfg[www_group]) $(cfg[install_dir])",
 		depends_on => {"roundcube_tgz_copied"},
 		contain => wmde_cmd_useshell,
 		handle => "roundcube_untarred";
-	!roundcube_untar::
+	(!roundcube_untar)&(!roundcube_tgz_file_repaired)::
 		"/usr/bin/true"
 		inform => "false",
 		depends_on => {"roundcube_tgz_copied"},