From 6d68941d6081bd568ecf1062a83361765338c9d0 Mon Sep 17 00:00:00 2001 From: 0rC0 Date: Tue, 13 Nov 2018 00:30:54 +0100 Subject: [PATCH 1/4] fix #1 --- helpers/server | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helpers/server b/helpers/server index b60ac1b..5e9d0c7 100644 --- a/helpers/server +++ b/helpers/server @@ -11,7 +11,7 @@ server_get_display() { server_get_dpi() { # Calculate diagonal diagonal() { - printf '%.0f' $(bc <<< "scale=2; sqrt($1^2+$2^2)") + bc <<< "scale=2; sqrt($h_width^2+$h_height^2)" | python -c "print(round(float(input())))" } ## Find display resolution @@ -25,10 +25,10 @@ server_get_dpi() { local h_pheight=$(echo "$h_psize" | cut -d' ' -f2) local h_pdiag=$(bc <<< "scale=0; $(diagonal $h_pwidth $h_pheight)/25.4") local h_dpi=$(bc <<< "scale=2; $h_diag/$h_pdiag" | xargs printf '%.0f') - + unset -f diagonal echo $h_dpi -} +} # Return the server ip server_get_ip() { From d46b04265ddc5e5cc49c29152bc7ed28781613e7 Mon Sep 17 00:00:00 2001 From: 0rC0 Date: Tue, 13 Nov 2018 00:38:51 +0100 Subject: [PATCH 2/4] fix #1 --- helpers/server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/server b/helpers/server index 5e9d0c7..cbefdb4 100644 --- a/helpers/server +++ b/helpers/server @@ -11,7 +11,7 @@ server_get_display() { server_get_dpi() { # Calculate diagonal diagonal() { - bc <<< "scale=2; sqrt($h_width^2+$h_height^2)" | python -c "print(round(float(input())))" + bc <<< "scale=2; sqrt($h_width^2+$h_height^2)" | python3 -c "print(round(float(input())))" } ## Find display resolution From d7dc4da8bc4c553c62b3839ca09f67962147988a Mon Sep 17 00:00:00 2001 From: 0rC0 Date: Tue, 13 Nov 2018 19:30:27 +0100 Subject: [PATCH 3/4] fix #1 LC_ALL=C --- helpers/server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/server b/helpers/server index cbefdb4..afd4e3b 100644 --- a/helpers/server +++ b/helpers/server @@ -11,7 +11,7 @@ server_get_display() { server_get_dpi() { # Calculate diagonal diagonal() { - bc <<< "scale=2; sqrt($h_width^2+$h_height^2)" | python3 -c "print(round(float(input())))" + LC_ALL="C" printf '%.0f' $(bc <<< "scale=2; sqrt(540^2+960^2)") } ## Find display resolution From a95174e682bd16a5f5f2590b62594d012b5ca569 Mon Sep 17 00:00:00 2001 From: 0rC0 Date: Tue, 13 Nov 2018 19:36:05 +0100 Subject: [PATCH 4/4] fix #1 --- helpers/server | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/server b/helpers/server index afd4e3b..1a1f7b4 100644 --- a/helpers/server +++ b/helpers/server @@ -11,7 +11,8 @@ server_get_display() { server_get_dpi() { # Calculate diagonal diagonal() { - LC_ALL="C" printf '%.0f' $(bc <<< "scale=2; sqrt(540^2+960^2)") + bc <<< "scale=2; sqrt($h_width^2+$h_height^2)" | python -c "print(round(float(input())))" + } ## Find display resolution