From ceb068efbed010350a2b32b13048244e1a7462b3 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 17 Oct 2019 16:28:00 -0300 Subject: [PATCH] Reactivating .NET extension on windows package. --- win/pack.sh | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/win/pack.sh b/win/pack.sh index cdd3ccc..1741ae8 100755 --- a/win/pack.sh +++ b/win/pack.sh @@ -30,7 +30,7 @@ PRODUCT_NAME="pw3270" LIBRARY_NAME="lib3270" CORE_LIBRARIES="lib3270 libv3270 libipc3270" PACKAGE_PLUGINS="" -PACKAGE_EXTRAS="libhllapi tn3270-mono" +PACKAGE_EXTRAS="libhllapi mono-tn3270" TARGET_ARCHS="x86_64 x86_32" GIT_URL="https://github.com/PerryWerneck" @@ -77,21 +77,32 @@ prepare() mkdir -p ${WORKDIR}/sources - TEMPVAR=${1}_branch - BRANCH=${!TEMPVAR} 2> /dev/null + NAME_CHECK=$(echo "${1}" | grep -c "-") + + if [ "${NAME_CHECK}" == "0" ]; then + TEMPVAR=${1}_branch + BRANCH=${!TEMPVAR} + echo "${TEMPVAR}: ${BRANCH}" + else + BRANCH="" + fi if [ -z ${BRANCH} ]; then - git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} + git clone ${GIT_URL}/${1}.git --quiet ${WORKDIR}/sources/${1} else echo "Preparing ${1} ${BRANCH}" echo -e "\e]2;Preparing ${1} ${BRANCH}\a" - git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} + git clone --branch "${BRANCH}" --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} fi if [ "$?" != "0" ]; then failed "Can't get sources for ${1}" fi + if [ ! -e "${WORKDIR}/sources/${1}" ]; then + failed "Can't get sources for ${1}" + fi + if [ -x ${PROJECTDIR}/win/prepare.${1} ]; then pushd ${WORKDIR}/sources/${1} ${PROJECTDIR}/win/prepare.${1} -- libgit2 0.21.2