From 3a698090005a8e9806d725a3b2df47fc2ac73487 Mon Sep 17 00:00:00 2001 From: Igor Chubin Date: Sat, 18 May 2019 09:31:05 +0000 Subject: [PATCH] cht.sh: minor fixes --- share/cht.sh.txt | 4 ++-- tests/results/8 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/cht.sh.txt b/share/cht.sh.txt index 8ecf98e..f0a01ae 100755 --- a/share/cht.sh.txt +++ b/share/cht.sh.txt @@ -155,7 +155,7 @@ EOF fi local space_needed=700 - local space_available; space_available=$(("$(df -k "$installdir" | awk '{print $4}' | tail -1)"/1024)) + local space_available; space_available=$(($(df -k "$installdir" | awk '{print $4}' | tail -1)/1024)) if [ "$space_available" -lt "$space_needed" ]; then echo "ERROR: Installation directory has no enough space (needed: ${space_needed}M, available: ${space_available}M" @@ -212,7 +212,7 @@ EOF else printf "\033[0;31m%s\033[0m\n" "FAILED" echo "Some tests were failed. Run the tests manually for further investigation:" - echo " cd $PWD; bash tests/run-tests.sh)" + echo " cd $PWD; bash run-tests.sh)" fi ) diff --git a/tests/results/8 b/tests/results/8 index 338dca5..8467a2a 100644 --- a/tests/results/8 +++ b/tests/results/8 @@ -155,7 +155,7 @@ EOF fi local space_needed=700 - local space_available; space_available=$(("$(df -k "$installdir" | awk '{print $4}' | tail -1)"/1024)) + local space_available; space_available=$(($(df -k "$installdir" | awk '{print $4}' | tail -1)/1024)) if [ "$space_available" -lt "$space_needed" ]; then echo "ERROR: Installation directory has no enough space (needed: ${space_needed}M, available: ${space_available}M" @@ -380,7 +380,7 @@ if [ "$CHTSH_MODE" = auto ] && [ -d "$CHEATSH_INSTALLATION" ]; then shift $((OPTIND - 1)) local url; url="$1"; shift - "$CHEATSH_INSTALLATION/ve/bin/python" "$CHEATSH_INSTALLATION/lib/standalone.py" "${url#"$CHTSH_URL"}" "$@" + PYTHONIOENCODING=UTF-8 "$CHEATSH_INSTALLATION/ve/bin/python" "$CHEATSH_INSTALLATION/lib/standalone.py" "${url#"$CHTSH_URL"}" "$@" } elif [ "$(uname -s)" = OpenBSD ] && [ -x /usr/bin/ftp ]; then # any better test not involving either OS matching or actual query?