From nobody Wed Oct 11 07:56:45 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S54q16xFcz4x41W; Wed, 11 Oct 2023 07:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S54q16S18z3c2p; Wed, 11 Oct 2023 07:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697011005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zMmuJIMLqqIv8mbYJQ9sJ21iYtWtOHUJ92s465nIVRo=; b=FPUqiXp3t8iL5NmQJaj77GeFW7YrnogA+XGyM57bWGZwbfd6XdV7fcDiWlTzMscbRZZyr+ puic3d77se+F6MId2GZjx8lrF6eNJCUgKgeuRmwgnr2Yu+vVWDs4BaV75cTXi5ZrQsIMN/ rSqJP/MheIT2RxXayQJoQfYKK9tRIzXFiIihDr2tVSYLKLb7dpE1o9zbDsZzFJHW6oBy+k g+yO0Eha5l/lxSqSVMtzElUwa2O7DSNczG/jNNVx+1aEqDHPwmtG2nMWXqLJkp4yKyHWkT JSqIdXcmMc9VOOGZMQdkSvlIIXXyz8RAfCIXwaal2pLUgqITmFWL21+czD/jzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697011005; a=rsa-sha256; cv=none; b=b8hxylgU6PwY1N6IjuZIRJpGD2U5A9CaVIlRCiCsgWEa8n0I0oEwWHa4ZHbVd+3YZ1rhsm wFiEdyi/6TqJ4T6/8ip0ucTrH9qAlTGQIEpRwzZl99Nw8U3p1WLbVJiRxdmm2WBKYrRfLO oU9xD++SR2jWzRCisKhp0HQqo1BP+MTR/yPXxqfamfZdGtQfqS38HLP9E7BNInrKvHALg3 Fax+NGU2+fSYPKYfqBoBj0FPFhP4DiCJ/CVtU7DVUoBYag0WB5v8W3Zn4NFeekbkN34cfq IwHRL+oO6PFdeF/ddO7owPONBUSDOtiJPuKGdYk1OiJZZZRjYQvq2nVoCi/pwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697011005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zMmuJIMLqqIv8mbYJQ9sJ21iYtWtOHUJ92s465nIVRo=; b=nKvRWpaGf5EzNE5lZs6/3LbWrc64rpxCzu+uG0cFIa6VEoR1/1gXg7CUcmX3hmV0tQHWBX mxtcfzXOvKOkTqSBQcEokwLoTD4vAqgqsMdER0dmwDHxrc00zIvzBkeexQQJr4FTACCzYr FbuWIqZvKCIqiJSfqP8IGh8nubLgBfCb5f6BukuXhTDB5BDHI3rLF7D1tPjUDI60679hIc 150mFpIFmUUWAQX5jf+8t9KzHAwjKxz0+f39yHRKkFrdBEoY+ZXJ8omiiyILAHBcqdg3e7 gzJiKx+NZ5oeDmJqgfys1qRw1RyHSLt8P2YIAXmMUDIfNk7YHa+sxZgXfHpm7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S54q15VdZz1CM5; Wed, 11 Oct 2023 07:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39B7ujle036377; Wed, 11 Oct 2023 07:56:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39B7ujSn036374; Wed, 11 Oct 2023 07:56:45 GMT (envelope-from git) Date: Wed, 11 Oct 2023 07:56:45 GMT Message-Id: <202310110756.39B7ujSn036374@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 9fee35128080 - main - dialog: force UTF-8 locale List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fee35128080f036c7b318cbbe20067ccca409db Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=9fee35128080f036c7b318cbbe20067ccca409db commit 9fee35128080f036c7b318cbbe20067ccca409db Author: Baptiste Daroussin AuthorDate: 2023-10-11 07:54:12 +0000 Commit: Baptiste Daroussin CommitDate: 2023-10-11 07:56:27 +0000 dialog: force UTF-8 locale On some terminal, namely "putty" and "linux", the unicode capability are not properly exposed, resulting in a not so nice UI, forcing the env to be unicode friendly with executing the DIDALOG commnands make the output nice in those environements --- Mk/Scripts/dialog4ports.sh | 4 ++-- Mk/bsd.licenses.mk | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Mk/Scripts/dialog4ports.sh b/Mk/Scripts/dialog4ports.sh index de62a91b583f..ba8dbb7cd48d 100644 --- a/Mk/Scripts/dialog4ports.sh +++ b/Mk/Scripts/dialog4ports.sh @@ -42,9 +42,9 @@ fi # Clear environment of PKGNAME or the dialog will show on older versions # that do not understand -v. if ! env -u PKGNAME ${DIALOG4PORTS} -v > /dev/null 2>&1; then - exec $DIALOG4PORTS > $OPTIONSFILE 2>&1 + exec env LC_ALL=C.UTF-8 $DIALOG4PORTS > $OPTIONSFILE 2>&1 fi # Newer versions use stderr to work around a jail issue # http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082383.html -exec $DIALOG4PORTS 2> $OPTIONSFILE +exec env LC_ALL=C.UTF-8 $DIALOG4PORTS 2> $OPTIONSFILE diff --git a/Mk/bsd.licenses.mk b/Mk/bsd.licenses.mk index f9332996207b..cc3b8f29f478 100644 --- a/Mk/bsd.licenses.mk +++ b/Mk/bsd.licenses.mk @@ -645,7 +645,7 @@ ${_LICENSE_COOKIE}: . if !defined(NO_LICENSES_DIALOGS) # Dialog interface . if ${_LICENSE_COMB} == "single" - @${DIALOG} --title "License for ${PKGNAME} (${_LICENSE})" \ + @${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --title "License for ${PKGNAME} (${_LICENSE})" \ --yes-label Accept --no-label Reject --yesno \ "$$(${CAT} ${_LICENSE_FILE})" 21 76 @@ -662,13 +662,13 @@ ${_LICENSE_COOKIE}: done; \ menu_cmd="$${menu_cmd} REJECT \"Reject the licenses (all)\""; \ while true; do \ - ${SH} -c "$${menu_cmd} 2>\"$${tmpfile}\""; \ + ${SH} -c "${SETENV} LC_ALL=C.UTF-8 $${menu_cmd} 2>\"$${tmpfile}\""; \ result=$$(${CAT} "$${tmpfile}"); \ case $${result} in \ REJECT) exit 1;; \ VIEW_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^VIEW_//'); \ file=$$(${GREP} "^$${name}:" ${_LICENSE_ASK_DATA} | ${CUT} -d : -f 2); \ - ${DIALOG} --textbox "$${file}" 21 75 ;; \ + ${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --textbox "$${file}" 21 75 ;; \ USE_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^USE_//'); \ ${ECHO_CMD} $${name} > ${_LICENSE_COOKIE}; \ break ;; \ @@ -680,7 +680,7 @@ ${_LICENSE_COOKIE}: . for lic in ${_LICENSE_TO_ASK} @${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA} . endfor - @menu_cmd="${DIALOG} --hline \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \ + @menu_cmd="${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --hline \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \ trap '${RM} $$tmpfile' EXIT INT TERM; \ tmpfile=$$(mktemp -t portlicenses); \ for lic in ${_LICENSE_TO_ASK}; do \ @@ -695,7 +695,7 @@ ${_LICENSE_COOKIE}: REJECT) exit 1 ;; \ VIEW_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^VIEW_//'); \ file=$$(${GREP} "^$${name}:" ${_LICENSE_ASK_DATA} | ${CUT} -d : -f 2); \ - ${DIALOG} --textbox "$${file}" 21 75 ;; \ + ${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --textbox "$${file}" 21 75 ;; \ esac; \ done . endif