cease.sh

@@ -58,7 +58,6 @@ fi
 
 if [[ "${SERVER}" == server* ]] || [[ "${SERVER}" == mega* ]]; then
 	openrsync -va --del /home/mischa/vms/ mischa@wm1.obsda.ms:vms/${HOST}/
-	ssh wm1.obsda.ms "doas userdel -r ${HOST}${1%.txt}"
-	ssh wm1.obsda.ms "doas groupdel ${HOST}${1%.txt}"
+	ssh wm1.obsda.ms "doas userdel -r ${HOST}${1%.txt} && doas groupdel ${HOST}${1%.txt}"
 	openrsync -va --del /home/mischa/vms/ mischa@rx.high5.nl:vms/${HOST}/
 fi

notify.pl

@@ -34,8 +34,6 @@ my $function = $ARGV[0] || "empty";
 my $function_variable = $ARGV[1] || "empty";
 my $message = $ARGV[2] || "empty";
 
-$function_variable = substr $function_variable, 0, -4 if ($function_variable =~ m/.txt/);
-
 # define the prices for the different components of the VM
 my $base_price = '67';
 my %memory_prices = ('2G' => '10', '4G' => '30', '8G' => '70');