From bf17f3fce50a0e03ba7df4868fd5a9124bdd8947 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 6 Apr 2019 13:44:47 -0300 Subject: DO NOT use clientdata on pipelines, use client-data instead --- .tools/manaplus.sh | 6 +++--- .tools/testxml.sh | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.tools/manaplus.sh b/.tools/manaplus.sh index aeb39a86..fb09bd36 100755 --- a/.tools/manaplus.sh +++ b/.tools/manaplus.sh @@ -14,13 +14,13 @@ aptget_install gcc g++ \ pwd ls -./clientdata/.tools/downloadlib.sh manaplus master || exit 1 +./client-data/.tools/downloadlib.sh manaplus master || exit 1 -export HOME=`pwd`/clientdata/shared +export HOME=`pwd`/client-data/shared cd manaplus_master || exit 1 export SDL_VIDEODRIVER=dummy -./bin/manaplus --validate -u -d ../clientdata || exit 1 +./bin/manaplus --validate -u -d ../client-data || exit 1 ls "${HOME}/.local/share/mana/manaplus.log" || exit 1 grep -A 10 "Assert:" "${HOME}/.local/share/mana/manaplus.log" diff --git a/.tools/testxml.sh b/.tools/testxml.sh index eb0cd412..9e94e753 100755 --- a/.tools/testxml.sh +++ b/.tools/testxml.sh @@ -15,19 +15,19 @@ cd tools/testxml check_error $? export RES=$(cat errors.txt) if [[ -n "${RES}" ]]; then - echo "xml check failed" >../../clientdata/shared/error.log - echo ${RES} >>../../clientdata/shared/error.log - cat ../../clientdata/shared/error.log + echo "xml check failed" >../../client-data/shared/error.log + echo ${RES} >>../../client-data/shared/error.log + cat ../../client-data/shared/error.log exit 1 fi -echo >../../clientdata/shared/error.log -./testxml.py silent >../../clientdata/shared/error.log +echo >../../client-data/shared/error.log +./testxml.py silent >../../client-data/shared/error.log res="$?" -cat ../../clientdata/shared/error.log +cat ../../client-data/shared/error.log if [ "$res" != 0 ]; then echo "test xml error" exit 1 fi -echo >../../clientdata/shared/error.log +echo >../../client-data/shared/error.log -- cgit v1.2.3-70-g09d2