Allow float values for priming

moonlight200 · May 4, 2021 · 3ce6cfd · 3ce6cfd
1 parent a5a7bd6
commit 3ce6cfd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/opensand.sh b/opensand.sh
@@ -3,7 +3,7 @@ set -o nounset
 set -o errtrace
 set -o functrace
 
-export SCRIPT_VERSION="1.5.2"
+export SCRIPT_VERSION="1.5.3"
 export SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 set -o allexport

diff --git a/setup.sh b/setup.sh
@@ -50,8 +50,8 @@ function _osnd_prime_env() {
 	local seconds=$1
 
 	log D "Priming environment"
-	sudo timeout --foreground $((seconds + 1)) ip netns exec osnd-cl \
-		ping -n -W 8 -c $((seconds * 100)) -l 100 -i 0.01 ${SV_LAN_SERVER_IP%%/*} >/dev/null
+	sudo timeout --foreground $(echo "$seconds + 1" | bc -l) ip netns exec osnd-cl \
+		ping -n -W 8 -c $(echo "$seconds * 100" | bc -l) -l 100 -i 0.01 ${SV_LAN_SERVER_IP%%/*} >/dev/null
 }
 
 # osnd_setup(scenario_config_ref)
@@ -79,7 +79,7 @@ function osnd_setup() {
 	sleep 1
 	osnd_setup_opensand "$delay_sat" "$attenuation" "$modulation_id"
 	sleep 1
-	if [[ "$prime" -gt 0 ]]; then
+	if (( $(echo "$prime > 0" | bc -l) )); then
 		_osnd_prime_env $prime
 	fi