From e7f5e34a8b47d699ab2effc64ac1ce0c7c86c6c4 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 29 Nov 2020 21:28:20 +0100
Subject: [PATCH] More hunting of unecessarily verbose message
---
sub_scripts/launcher.sh | 4 ++--
sub_scripts/testing_process.sh | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sub_scripts/launcher.sh b/sub_scripts/launcher.sh
index 807ed9f..7b8b05a 100755
--- a/sub_scripts/launcher.sh
+++ b/sub_scripts/launcher.sh
@@ -317,7 +317,7 @@ LXC_STOP () {
start_timer
# Stop the LXC container
if is_lxc_running; then
- echo "Stop the LXC container" | tee --append "$test_result"
+ echo "Stop the LXC container" >> "$test_result"
sudo lxc-stop --name=$lxc_name | tee --append "$test_result" 2>&1
fi
@@ -337,7 +337,7 @@ LXC_STOP () {
fi
# Restore the snapshot.
- echo "Restore the previous snapshot." | tee --append "$test_result"
+ echo "Restore the previous snapshot." >> "$test_result"
sudo rsync --acls --archive --delete --executability --itemize-changes --xattrs "$snapshot_path/$current_snapshot/rootfs/" "/var/lib/lxc/$lxc_name/rootfs/" > /dev/null 2>> "$test_result"
stop_timer 1 >> "$complete_log"
}
diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh
index d30d187..cd3aed5 100644
--- a/sub_scripts/testing_process.sh
+++ b/sub_scripts/testing_process.sh
@@ -818,7 +818,7 @@ CHECK_UPGRADE () {
# Uses the default snapshot
current_snapshot=snap0
# Stop and restore the LXC container
- LXC_STOP
+ LXC_STOP >> $complete_log
done 4< "$script_dir/upgrade_list"
}
@@ -942,7 +942,7 @@ CHECK_PUBLIC_PRIVATE () {
break_before_continue
# Stop and restore the LXC container
- LXC_STOP
+ LXC_STOP >> $complete_log
done
}
@@ -1285,7 +1285,7 @@ CHECK_BACKUP_RESTORE () {
sudo mv -f ./archives /var/lib/lxcsnaps/$lxc_name/$current_snapshot/rootfs/home/yunohost.backup/
# Stop and restore the LXC container
- LXC_STOP
+ LXC_STOP >> $complete_log
ECHO_FORMAT "\nRestore on a clean YunoHost system...\n" "white" "bold" clog
fi
@@ -1328,7 +1328,7 @@ CHECK_BACKUP_RESTORE () {
break_before_continue
# Stop and restore the LXC container
- LXC_STOP
+ LXC_STOP >> $complete_log
done
done
}
@@ -1488,7 +1488,7 @@ CHECK_CHANGE_URL () {
# Uses the default snapshot
current_snapshot=snap0
# Stop and restore the LXC container
- LXC_STOP
+ LXC_STOP >> $complete_log
done
}
@@ -1806,7 +1806,7 @@ ACTIONS_CONFIG_PANEL () {
# Uses the default snapshot
current_snapshot=snap0
# Stop and restore the LXC container
- LXC_STOP
+ LXC_STOP >> $complete_log
}
PACKAGE_LINTER () {
@@ -1875,7 +1875,7 @@ TEST_LAUNCHER () {
current_snapshot=snap0
# Stop and restore the LXC container
- LXC_STOP
+ LXC_STOP >> $complete_log
# Restore the started time for the timer
starttime=$global_start_timer